X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fmanual-package-config.mk;h=c37f204d9583ef427f5940a2e6c8747ac666ee1a;hb=e11c554e94c39223ea55991a552ccb244dfe4364;hp=2eb33b787a7c16406872e8d197d73492bf6a4ef6;hpb=34cc75e1a62638f2833815746ebce0a9114dc26b;p=ghc-hetmet.git

diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk
index 2eb33b7..c37f204 100644
--- a/rules/manual-package-config.mk
+++ b/rules/manual-package-config.mk
@@ -1,33 +1,47 @@
+# -----------------------------------------------------------------------------
+#
+# (c) 2009 The University of Glasgow
+#
+# This file is part of the GHC build system.
+#
+# To understand how the build system works and how to modify it, see
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Architecture
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Modifying
+#
+# -----------------------------------------------------------------------------
+
 
 define manual-package-config # args: $1 = dir
+$(call trace, manual-package-config($1))
+$(call profStart, manual-package-config($1))
 
 $1/package.conf.inplace : $1/package.conf.in $(GHC_PKG_INPLACE)
-	$(CPP) $(RAWCPP_FLAGS) -P \
+	$$(CPP) $$(RAWCPP_FLAGS) -P \
 		-DTOP='"$$(TOP)"' \
 		$$($1_PACKAGE_CPP_OPTS) \
-		-x c -I$$(GHC_INCLUDE_DIR) $$< | \
-	grep -v '^#pragma GCC' | \
-	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$$@
+		-x c -I$$(GHC_INCLUDE_DIR) $$< -o $$@.raw
+	grep -v '^#pragma GCC' $$@.raw | \
+	    sed -e 's/""//g' -e 's/:[ 	]*,/: /g' > $$@
 
-	$(GHC_PKG_INPLACE) update --force $$@
+	"$$(GHC_PKG_INPLACE)" update --force $$@
 
 # This is actually a real file, but we need to recreate it on every
 # "make install", so we declare it as phony
 .PHONY: $1/package.conf.install
 $1/package.conf.install:
-	$(CPP) $(RAWCPP_FLAGS) -P \
+	$$(CPP) $$(RAWCPP_FLAGS) -P \
 		-DINSTALLING \
-		-DLIB_DIR='"$$(libdir)"' \
-		-DINCLUDE_DIR='"$$(libdir)/include"' \
+		-DLIB_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))"' \
+		-DINCLUDE_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))/include"' \
 		$$($1_PACKAGE_CPP_OPTS) \
-		-x c -I$$(GHC_INCLUDE_DIR) $1/package.conf.in | \
-	grep -v '^#pragma GCC' | \
-	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$$@
+		-x c -I$$(GHC_INCLUDE_DIR) $1/package.conf.in -o $$@.raw
+	grep -v '^#pragma GCC' $$@.raw | \
+	    sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$$@
 
-clean : clean_$1
-.PHONY: clean_$1
-clean_$1 : clean_$1_package.conf
+distclean : clean_$1_package.conf
 .PHONY: clean_$1_package.conf
 clean_$1_package.conf :
-	$(RM) $1/package.conf.install $1/package.conf.inplace
+	"$$(RM)" $$(RM_OPTS) $1/package.conf.install $1/package.conf.inplace
+
+$(call profEnd, manual-package-config($1))
 endef