diff options
| author | simonmar <unknown> | 2001-03-20 15:57:30 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2001-03-20 15:57:30 +0000 |
| commit | b6590afc04964ce04181980a51ed36674b4c4b29 (patch) | |
| tree | 19fb698bc468128f9ef3ccee1c00a9efc8ee8eeb /ghc/utils | |
| parent | 0793be14161a8240259786a1edad400bc8577a93 (diff) | |
| download | haskell-b6590afc04964ce04181980a51ed36674b4c4b29.tar.gz | |
[project @ 2001-03-20 15:57:30 by simonmar]
play quoting games to hopefully get this to build with both ghc-4.08.2
and ghc-4.11+.
Diffstat (limited to 'ghc/utils')
| -rw-r--r-- | ghc/utils/ghc-pkg/Main.hs | 6 | ||||
| -rw-r--r-- | ghc/utils/ghc-pkg/Makefile | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs index 6ff2055f22..931d54c716 100644 --- a/ghc/utils/ghc-pkg/Main.hs +++ b/ghc/utils/ghc-pkg/Main.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.2 2001/03/16 10:04:31 simonmar Exp $ +-- $Id: Main.hs,v 1.3 2001/03/20 15:57:30 simonmar Exp $ -- -- Package management tool ----------------------------------------------------------------------------- @@ -18,7 +18,9 @@ import Directory import System import IO -default_pkgconf = clibdir ++ "/package.conf" +-- string gap games to confuse CPP. +default_pkgconf = "\ + \ clibdir" ++ "/package.conf" main = do args <- getArgs diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile index d786868e3c..27dd6bfa62 100644 --- a/ghc/utils/ghc-pkg/Makefile +++ b/ghc/utils/ghc-pkg/Makefile @@ -1,11 +1,11 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.3 2001/03/16 10:07:02 simonmar Exp $ +# $Id: Makefile,v 1.4 2001/03/20 15:57:30 simonmar 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) |