Reorganisation of the source tree

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

diff --git a/ghc/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile
similarity index 89%
rename from ghc/utils/ghc-pkg/Makefile
rename to utils/ghc-pkg/Makefile
index d513a91..c8a075d 100644 (file)
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/utils/ghc-pkg/Makefile
@@ -1,5 +1,3 @@
-# -----------------------------------------------------------------------------
-
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
@@ -12,7 +10,7 @@ INSTALLING=1
 SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
 
 # This causes libghccompat.a to be used:
-include $(GHC_LIB_COMPAT_DIR)/compat.mk
+include $(GHC_COMPAT_DIR)/compat.mk
 
 # This is required because libghccompat.a must be built with
 # $(GhcHcOpts) because it is linked to the compiler, and hence
@@ -43,7 +41,7 @@ EXTRA_SRCS += $(VERSION_HS)
 
 boot :: $(VERSION_HS)
 
-Version.hs : Makefile $(TOP)/mk/version.mk
+Version.hs : Makefile $(TOP)/mk/config.mk
        @$(RM) -f $(VERSION_HS)
        @echo "Creating $(VERSION_HS) ... "
        @echo "module Version where" >>$(VERSION_HS)
@@ -66,8 +64,8 @@ GHCPKGBIN=$(libexecdir)/$(HS_PROG)
 PKGCONF=$(libdir)/package.conf
 endif # BIN_DIST
 else
-GHCPKGBIN=$(FPTOOLS_TOP_ABS)/ghc/utils/ghc-pkg/$(HS_PROG)
-PKGCONF=$(FPTOOLS_TOP_ABS_PLATFORM)/ghc/driver/package.conf.inplace
+GHCPKGBIN=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/$(HS_PROG)
+PKGCONF=$(FPTOOLS_TOP_ABS_PLATFORM)/driver/package.conf.inplace
 endif
 
 ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
@@ -102,7 +100,7 @@ clean distclean maintainer-clean ::
        $(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
 endif
 
-# ghc-pkg is needed to boot in ghc/rts and library dirs
+# ghc-pkg is needed to boot in rts/ and library dirs
 # Do a recursive 'make all' after generating dependencies, because this
 # will work with 'make -j'.
 ifneq "$(BootingFromHc)" "YES"