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

diff --git a/distrib/Makefile b/distrib/Makefile
index ee8fc28..7f8add1 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -19,38 +19,40 @@ install-strip:
 
 install ::
 	$(INSTALL_DIR) $(bindir)
+	$(INSTALL_DIR) $(datadir)
+	echo "[]" > $(datadir)/package.conf
 
 install::
 	$(MAKE) -C includes  install      DOING_BIN_DIST=YES
-	$(MAKE) -C driver    install      DOING_BIN_DIST=YES
 	$(MAKE) -C utils     install      DOING_BIN_DIST=YES
 	$(MAKE) -C rts       install      DOING_BIN_DIST=YES
 	$(MAKE) -C libraries install      DOING_BIN_DIST=YES
+	$(MAKE) -C libffi    install      DOING_BIN_DIST=YES
 	$(MAKE) -C compiler  install      DOING_BIN_DIST=YES
+	$(MAKE) -C ghc       install      DOING_BIN_DIST=YES
+	$(MAKE) -C driver    install      DOING_BIN_DIST=YES
 	$(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
 	@echo =======================================================================
 	@echo Installation of $(package)-$(version) was successful.
 	@echo
-ifneq "$(GREPPED_PATH)" ""
+ifeq "$(GREPPED_PATH)" ""
 	@echo To use, add $(bindir) to your PATH.
 	@echo
 endif
-	@if test -f share/html/index.html; then \
+	@if test -f $(htmldir)/index.html; then \
 	   echo For documentation, see $(htmldir)/index.html ; \
-	elif test -d share/html ; then \
-	   echo Docs can be found in $(htmldir). ; \
 	else \
 	   echo "Warning: this binary distribution does NOT contain documentation!" ; \
 	fi