diff options
| author |  simonmar <unknown> | 2005-01-20 14:22:28 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2005-01-20 14:22:28 +0000 |
| commit | 7fb13b09a9eb8182440ace4a9f4d4bd83ad7652a (patch) | |
| tree | 2aed67380af0692edd8577de65b499a32d50afa0 /package.conf.in | |
| parent | dbd7fd6c08e277969cda763e1045a61015bd4429 (diff) | |
[project @ 2005-01-20 14:22:28 by simonmar]
Fill in the haddock-interfaces and haddock-html fields in the
package.conf files.
To do this I had to make some changes:
- haddock-interfaces requires the value of $(datadir). We can't
just plug this in, because $(datadir) might change at install-time
(eg. a Windows installer can be placed anywhere, as can a Unix
binary .tar.gz distribution). The current trick is for the
compiler to splice in the value of $libdir in package.conf at
runtime. So we could extend this mechanism and tell the compiler
the value of $datadir via a command-line option, but that seems
ugly.
On Windows, $datadir==$libdir, so we don't need any changes:
package.conf still uses $libdir, and a Windows installation is
independent of its absolute location. Even 'make install' on
Windows should have this property.
On Unix:
- for 'make install' and in-place execution, we just use
absolute paths in package.conf
- for a binary dist, we generate a package.conf that refers
to $libdir and $datadir, and splice in the values at
install-time (distrib/Makefile-bin.in).
- Also, I renamed $libdir to $topdir to more closely reflect its
actual meaning. This is somewhat malicious in that it will flush
out all those clients using $libdir when they really shouldn't
be :-)
Diffstat (limited to 'package.conf.in')
| -rw-r--r-- | package.conf.in | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/package.conf.in b/package.conf.in index f27932f..1cd1da0 100644 --- a/package.conf.in +++ b/package.conf.in @@ -29,11 +29,9 @@ hidden-modules: import-dirs: IMPORT_DIR -#ifdef INSTALLING -library-dirs: "$libdir" -#else -library-dirs: "$libdir/libraries/unix", - "$libdir/libraries/unix/cbits" +library-dirs: LIB_DIR +#ifndef INSTALLING + , LIB_DIR"/cbits" #endif hs-libraries: "HSunix" @@ -44,12 +42,7 @@ extra-libs: "HSunix_cbits", "dl" extra-libs: "HSunix_cbits" #endif -#ifdef INSTALLING -include-dirs: -#else -include-dirs: "$libdir/libraries/unix/include" -#endif - +include-dirs: INCLUDE_DIR includes: HsUnix.h depends: base extra-hugs-opts: |