From 26a76eba7dd1b3b4bfeabb8a5228ca2328b1169c Mon Sep 17 00:00:00 2001 From: sof Date: Wed, 25 Aug 2004 17:14:55 +0000 Subject: [PATCH] [project @ 2004-08-25 17:14:55 by sof] backquote GHC_PKG_VERSION defn for <= ghc-6.0.x; believe this is only needed under mingw --- ghc/utils/ghc-pkg/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile index 45d2eff..26003d0 100644 --- a/ghc/utils/ghc-pkg/Makefile +++ b/ghc/utils/ghc-pkg/Makefile @@ -9,9 +9,16 @@ INSTALLING=1 # ----------------------------------------------------------------------------- # ghc-pkg.bin -SRC_HC_OPTS += -cpp -DPKG_TOOL -DWANT_PRETTY -D'GHC_PKG_VERSION="$(ProjectVersion)"' - ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi) +ghc_le_600 = $(shell if (test $(GhcCanonVersion) -le 600); then echo YES; else echo NO; fi) + +SRC_HC_OPTS += -cpp -DPKG_TOOL -DWANT_PRETTY + +ifeq "$(HOSTPLATFORM)$(ghc_le_600)" "i386-unknown-mingw32YES" +SRC_HC_OPTS += -D'GHC_PKG_VERSION=\"$(ProjectVersion)\"' +else +SRC_HC_OPTS += -D'GHC_PKG_VERSION="$(ProjectVersion)"' +endif ifeq "$(ghc_ge_504)" "NO" SRC_HC_OPTS += -package lang -package util -package text -- 1.7.10.4