diff options
| author | qrczak <unknown> | 2001-03-24 18:34:05 +0000 |
|---|---|---|
| committer | qrczak <unknown> | 2001-03-24 18:34:05 +0000 |
| commit | d9ad388a8df3f068def241a9d8d03cfa9c2de569 (patch) | |
| tree | 0cdbce44eace4db5c99320ea82ee37059c285efc /ghc/utils | |
| parent | 8c0fb915ad2992887562db8163ed53dfd201f2ef (diff) | |
| download | haskell-d9ad388a8df3f068def241a9d8d03cfa9c2de569.tar.gz | |
[project @ 2001-03-24 18:34:05 by qrczak]
Fix passing library dir to ghc-pkg.
Diffstat (limited to 'ghc/utils')
| -rw-r--r-- | ghc/utils/ghc-pkg/Main.hs | 6 | ||||
| -rw-r--r-- | ghc/utils/ghc-pkg/Makefile | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs index 931d54c716..0caefe6869 100644 --- a/ghc/utils/ghc-pkg/Main.hs +++ b/ghc/utils/ghc-pkg/Main.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.3 2001/03/20 15:57:30 simonmar Exp $ +-- $Id: Main.hs,v 1.4 2001/03/24 18:34:05 qrczak Exp $ -- -- Package management tool ----------------------------------------------------------------------------- @@ -18,9 +18,7 @@ import Directory import System import IO --- string gap games to confuse CPP. -default_pkgconf = "\ - \ clibdir" ++ "/package.conf" +default_pkgconf = clibdir ++ "/package.conf" main = do args <- getArgs diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile index 27dd6bfa62..0d22015b43 100644 --- a/ghc/utils/ghc-pkg/Makefile +++ b/ghc/utils/ghc-pkg/Makefile @@ -1,11 +1,12 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.4 2001/03/20 15:57:30 simonmar Exp $ +# $Id: Makefile,v 1.5 2001/03/24 18:34:05 qrczak Exp $ TOP=../.. include $(TOP)/mk/boilerplate.mk HS_PROG = ghc-pkg -SRC_HC_OPTS += -cpp -DPKG_TOOL -DWANT_PRETTY -package lang -package util -package text -Dclibdir="$(libdir)" +SRC_HC_OPTS += -cpp -DPKG_TOOL -DWANT_PRETTY -package lang \ + -package util -package text -Dclibdir="\"$(libdir)\"" INSTALL_PROGS = $(HS_PROG) |