X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Futils%2Fghc-pkg%2FMakefile;h=bd04d06253d2416909329964abf1de256d7c05c2;hb=c63aaee42e3e95276861121286eefce511cd1343;hp=7c9cd50c851a36e07d9e826e106d2485ef7a220b;hpb=0c0d05f46ed42dceac771999adb769f12c10cc39;p=ghc-hetmet.git

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index 7c9cd50..bd04d06 100644
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.16 2002/04/30 14:40:56 simonmar Exp $
+# $Id: Makefile,v 1.19 2002/10/27 10:38:33 mthomas Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -10,19 +10,23 @@ INSTALLING=1
 # -----------------------------------------------------------------------------
 # ghc-pkg.bin
 
-SRC_HC_OPTS      += -cpp -DPKG_TOOL -DWANT_PRETTY -package lang \
-		    -package util -package text
+SRC_HC_OPTS      += -cpp -DPKG_TOOL -DWANT_PRETTY
+
+ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
+
+ifeq "$(ghc_ge_504)" "NO"
+SRC_HC_OPTS +=  -package lang -package util -package text
+endif
 
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 HS_PROG           = ghc-pkg.bin
 INSTALL_LIBEXECS += $(HS_PROG)
-else
+
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 HS_PROG           = ghc-pkg.exe
 INSTALL_PROGS    += $(HS_PROG)
-SRC_HC_OPTS      += -package win32
+SRC_HC_OPTS      += -fglasgow-exts '-\#include <process.h>' -optl "-Wl,-lkernel32"
 endif
 
-
 # -----------------------------------------------------------------------------
 # ghc-pkg script
 
@@ -39,7 +43,7 @@ GHCPKGBIN=$(FPTOOLS_TOP_ABS)/ghc/utils/ghc-pkg/$(HS_PROG)
 PKGCONF=$(FPTOOLS_TOP_ABS)/ghc/driver/package.conf.inplace
 endif
 
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INSTALLED_SCRIPT_PROG  = ghc-pkg-$(ProjectVersion)
 endif
 INPLACE_SCRIPT_PROG    = ghc-pkg-inplace
@@ -47,14 +51,14 @@ INPLACE_SCRIPT_PROG    = ghc-pkg-inplace
 SCRIPT_OBJS	  = ghc-pkg.sh
 INTERP		  = $(SHELL)
 SCRIPT_SUBST_VARS = GHCPKGBIN PKGCONFOPT
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INSTALL_SCRIPTS  += $(SCRIPT_PROG)
 endif
 PKGCONFOPT 	  = -f $(PKGCONF)
 
 ifeq "$(INSTALLING)" "1"
 SCRIPT_PROG 	=  $(INSTALLED_SCRIPT_PROG)
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 LINK 		=  ghc-pkg
 endif
 else