projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-02-12 15:17:13 by simonmar]
[ghc-hetmet.git]
/
ghc
/
utils
/
ghc-pkg
/
Makefile
diff --git
a/ghc/utils/ghc-pkg/Makefile
b/ghc/utils/ghc-pkg/Makefile
index
ad2d99b
..
e741d75
100644
(file)
--- a/
ghc/utils/ghc-pkg/Makefile
+++ b/
ghc/utils/ghc-pkg/Makefile
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.10 2001/08/21 13:14:51 rrt Exp $
+# $Id: Makefile,v 1.14 2002/02/12 15:17:24 simonmar Exp $
TOP=../..
include $(TOP)/mk/boilerplate.mk
TOP=../..
include $(TOP)/mk/boilerplate.mk
@@
-7,18
+7,26
@@
include $(TOP)/mk/boilerplate.mk
# hack for ghci-inplace script, see below
INSTALLING=1
# hack for ghci-inplace script, see below
INSTALLING=1
+# ghc-pkg is needed to boot in ghc/rts and library dirs
+ifneq "$(BootingFromHc)" "YES"
+boot :: all
+endif
+
# -----------------------------------------------------------------------------
# ghc-pkg.bin
# -----------------------------------------------------------------------------
# ghc-pkg.bin
-HS_PROG = ghc-pkg.bin
SRC_HC_OPTS += -cpp -DPKG_TOOL -DWANT_PRETTY -package lang \
SRC_HC_OPTS += -cpp -DPKG_TOOL -DWANT_PRETTY -package lang \
- -package util -package text -I$(GHC_INCLUDE_DIR)
+ -package util -package text
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+HS_PROG = ghc-pkg.bin
+INSTALL_LIBEXECS += $(HS_PROG)
+else
+HS_PROG = ghc-pkg.exe
+INSTALL_PROGS += $(HS_PROG)
SRC_HC_OPTS += -package win32
endif
SRC_HC_OPTS += -package win32
endif
-INSTALL_LIBEXECS = $(HS_PROG)
# -----------------------------------------------------------------------------
# ghc-pkg script
# -----------------------------------------------------------------------------
# ghc-pkg script
@@
-36,18
+44,24
@@
GHCPKGBIN=$(FPTOOLS_TOP_ABS)/ghc/utils/ghc-pkg/$(HS_PROG)
PKGCONF=$(FPTOOLS_TOP_ABS)/ghc/driver/package.conf.inplace
endif
PKGCONF=$(FPTOOLS_TOP_ABS)/ghc/driver/package.conf.inplace
endif
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
INSTALLED_SCRIPT_PROG = ghc-pkg-$(ProjectVersion)
INSTALLED_SCRIPT_PROG = ghc-pkg-$(ProjectVersion)
+endif
INPLACE_SCRIPT_PROG = ghc-pkg-inplace
SCRIPT_OBJS = ghc-pkg.sh
INTERP = $(SHELL)
SCRIPT_SUBST_VARS = GHCPKGBIN PKGCONFOPT
INPLACE_SCRIPT_PROG = ghc-pkg-inplace
SCRIPT_OBJS = ghc-pkg.sh
INTERP = $(SHELL)
SCRIPT_SUBST_VARS = GHCPKGBIN PKGCONFOPT
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
INSTALL_SCRIPTS += $(SCRIPT_PROG)
INSTALL_SCRIPTS += $(SCRIPT_PROG)
+endif
PKGCONFOPT = -f $(PKGCONF)
ifeq "$(INSTALLING)" "1"
SCRIPT_PROG = $(INSTALLED_SCRIPT_PROG)
PKGCONFOPT = -f $(PKGCONF)
ifeq "$(INSTALLING)" "1"
SCRIPT_PROG = $(INSTALLED_SCRIPT_PROG)
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
LINK = ghc-pkg
LINK = ghc-pkg
+endif
else
SCRIPT_PROG = $(INPLACE_SCRIPT_PROG)
endif
else
SCRIPT_PROG = $(INPLACE_SCRIPT_PROG)
endif