[project @ 2004-11-21 12:13:23 by panne]

[ghc-hetmet.git] / ghc / utils / ghc-pkg / Makefile

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index a29c84e..cda1fbb 100644 (file)
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -10,16 +10,16 @@ INSTALLING=1
 # ghc-pkg.bin
 
 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
+SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
 
-# <= 6.0.x quotes all arguments when invoking utils (using double quotes), hence
-# the need to escape the double quotes. >= 6.2.x does not.
-ifeq "$(ghc_le_600)" "YES"
-SRC_HC_OPTS += -D'GHC_PKG_VERSION=\"$(ProjectVersion)\"'
-else
-SRC_HC_OPTS += -D'GHC_PKG_VERSION="$(ProjectVersion)"'
+SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libraries
+SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
+SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
+
+ifeq "$(Windows)" "YES"
+# not very nice, but required for -lghccompat on Windows
+SRC_LD_OPTS += -lshell32
 endif
 
 ifeq "$(ghc_ge_504)" "NO"
@@ -38,6 +38,22 @@ HS_PROG           = ghc-pkg.bin
 INSTALL_LIBEXECS += $(HS_PROG)
 endif
 
+# -----------------------------------------------------------------------------=
+# Create the Version.hs file
+
+VERSION_HS = Version.hs
+EXTRA_SRCS += $(VERSION_HS)
+
+boot :: $(VERSION_HS)
+
+Version.hs : Makefile $(TOP)/mk/version.mk
+       @$(RM) -f $(VERSION_HS)
+       @echo "Creating $(VERSION_HS) ... "
+       @echo "module Version where" >>$(VERSION_HS)
+       @echo "version    = \"$(ProjectVersion)\"" >> $(VERSION_HS)
+       @echo "targetOS   = \"$(TargetOS_CPP)\"" >> $(VERSION_HS)
+       @echo "targetARCH = \"$(TargetArch_CPP)\"" >> $(VERSION_HS)
+
 # -----------------------------------------------------------------------------
 # ghc-pkg script
 
@@ -65,7 +81,7 @@ SCRIPT_SUBST_VARS = GHCPKGBIN PKGCONFOPT
 ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INSTALL_SCRIPTS  += $(SCRIPT_PROG)
 endif
-PKGCONFOPT       = -f $(PKGCONF)
+PKGCONFOPT       = --global-conf $(PKGCONF)
 
 ifeq "$(INSTALLING)" "1"
 SCRIPT_PROG    =  $(INSTALLED_SCRIPT_PROG)