X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=0741b563068c305bfe5bfa803bae4f4d95550cd4;hb=c7170e8e18c97527c256469a5ebbc5c724d6a900;hp=8175db5e465425b83a95cdbdf0606ced0b62003f;hpb=6f476448854b3775b806b6a07a530aa2b70ea02f;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 8175db5..0741b56 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -713,13 +713,13 @@ install_libs: $(INSTALL_LIBS)
 	done
 
 install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS)
-	"$(MKDIRHIER)" $(DESTDIR)$(libexecdir)
+	$(INSTALL_DIR) $(DESTDIR)$(libexecdir)
 	for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
 		$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(libexecdir); \
 	done
 
 install_libexecs:  $(INSTALL_LIBEXECS)
-	"$(MKDIRHIER)" $(DESTDIR)$(libexecdir)
+	$(INSTALL_DIR) $(DESTDIR)$(libexecdir)
 	for i in $(INSTALL_LIBEXECS); do \
 		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(libexecdir); \
 	done
@@ -756,8 +756,10 @@ endif
 
 install_packages: install_libexecs
 install_packages: libffi/package.conf.install rts/package.conf.install
-	"$(MKDIRHIER)" $(DESTDIR)$(libdir)
-	echo "[]" > $(INSTALLED_PACKAGE_CONF)
+	$(INSTALL_DIR) $(DESTDIR)$(libdir)
+	"$(RM)" $(RM_OPTS) $(INSTALLED_PACKAGE_CONF)
+	$(CREATE_DATA)     $(INSTALLED_PACKAGE_CONF)
+	echo "[]"       >> $(INSTALLED_PACKAGE_CONF)
 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update libffi/package.conf.install
 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update rts/package.conf.install
 	$(foreach p, $(PACKAGES) $(PACKAGES_STAGE2),\
@@ -954,13 +956,21 @@ CLEAN_FILES += utils/ghc-pwd/ghc-pwd.exe
 CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi
 CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o
 CLEAN_FILES += libraries/bootstrapping.conf
+CLEAN_FILES += libraries/integer-gmp/gmp/gmp.h
+CLEAN_FILES += libraries/integer-gmp/gmp/libgmp.a
+CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h
+CLEAN_FILES += libraries/integer-gmp/cbits/mkGmpDerivedConstants
 
-clean : clean_files clean_libraries
+clean : clean_files clean_libraries clean_gmp
 
 .PHONY: clean_files
 clean_files :
 	"$(RM)" $(RM_OPTS) $(CLEAN_FILES)
 
+clean_gmp:
+	"$(RM)" $(RM_OPTS) -r libraries/integer-gmp/gmp/objs
+	"$(RM)" $(RM_OPTS) -r libraries/integer-gmp/gmp/gmpbuild
+
 .PHONY: clean_libraries
 clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES) $(PACKAGES_STAGE2))
 clean_libraries: $(patsubst %,clean_libraries/%_dist-boot,$(BOOT_PKGS))