Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Change default installation dirs for executables on Windows:
before:

  bindir  = $prefix\$pkgid
  datadir = $prefix

now:

  bindir  = $prefix\Haskell\bin
  datadir = $prefix\Haskell

datasubdir is still $pkgid, so data files for an exectuable will be
installed in $prefix\Haskell\$pkgid.

the idea is that all executables are installed in the same directory
by default, so setting PATH is easier.  Also, data files belonging to
Haskell programs are grouped together under $prefix\Haskell.
  • Loading branch information
Simon Marlow committed Aug 22, 2006
1 parent 302bf17 commit 82b96e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Distribution/Simple/LocalBuildInfo.hs
Expand Up @@ -203,7 +203,7 @@ foreign import stdcall unsafe "shlobj.h SHGetFolderPathA"
default_bindir :: FilePath
default_bindir = "$prefix" `joinFileName`
#if mingw32_HOST_OS || mingw32_TARGET_OS
"$pkgid"
"Haskell" `joinFileName` "bin"
#else
"bin"
#endif
Expand Down Expand Up @@ -235,7 +235,7 @@ default_datadir :: PackageDescription -> IO FilePath
default_datadir pkg_descr
#if mingw32_HOST_OS || mingw32_TARGET_OS
| hasLibs pkg_descr = getCommonFilesDir
| otherwise = return "$prefix"
| otherwise = return ("$prefix" `joinFileName` "Haskell")
#else
= return ("$prefix" `joinFileName` "share")
#endif
Expand Down
4 changes: 2 additions & 2 deletions doc/Cabal.xml
Expand Up @@ -1438,7 +1438,7 @@ runhaskell Setup.hs unregister --gen-script</screen>

<row>
<entry><literal>--bindir</literal></entry>
<entry><literal>$prefix\$pkgid</literal></entry>
<entry><literal>$prefix\Haskell\bin</literal></entry>
<entry><literal>$prefix/bin</literal></entry>
</row>

Expand All @@ -1462,7 +1462,7 @@ runhaskell Setup.hs unregister --gen-script</screen>

<row>
<entry><literal>--datadir</literal> (executable)</entry>
<entry><literal>$prefix</literal></entry>
<entry><literal>$prefix\Haskell</literal></entry>
<entry><literal>$prefix/share</literal></entry>
</row>

Expand Down

0 comments on commit 82b96e3

Please sign in to comment.