X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=distrib%2FMakefile;h=7f8add1f5034b74b526c673bd258a1b021448ded;hp=dd067b20b2dcd854e10e0a037edd373b2101edfa;hb=e5c3b478b3cd1707cf122833822f44b2ac09b8e9;hpb=b5978be7cc7e53fe418b23c2767540137da339b2

diff --git a/distrib/Makefile b/distrib/Makefile
index dd067b2..7f8add1 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -19,6 +19,8 @@ install-strip:
 
 install ::
 	$(INSTALL_DIR) $(bindir)
+	$(INSTALL_DIR) $(datadir)
+	echo "[]" > $(datadir)/package.conf
 
 install::
 	$(MAKE) -C includes  install      DOING_BIN_DIST=YES
@@ -32,13 +34,13 @@ install::
 	$(MAKE) -C gmp       install      DOING_BIN_DIST=YES
 	$(MAKE) -C docs      install-docs DOING_BIN_DIST=YES
 	$(MAKE) -C libraries/Cabal/doc install-docs DOING_BIN_DIST=YES
-	$(INSTALL_DATA) $(INSTALL_OPTS) extra-gcc-opts $(libdir)
+	$(INSTALL_DATA) $(INSTALL_OPTS) settings $(libdir)
 
 install :: postinstall denounce
 
 # Look to see if $(bindir) is in $(PATH). Assumes there are no funky
 # characters.
-GREPPED_PATH=$(shell echo "$(PATH)" | grep "\(^\|:\)$(bindir)\(:\|$$\)")
+GREPPED_PATH=$(shell echo ":$(PATH):" | grep ":$(bindir):")
 
 denounce:
 	@echo