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

diff --git a/distrib/Makefile b/distrib/Makefile
index a91557e..7f8add1 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -1,7 +1,7 @@
 
 include Makefile-vars
 
-.PHONY: install postinstall denounce show-install-setup
+.PHONY: install-strip install postinstall denounce show-install-setup
 
 #.PHONY: in-place
 # This has bitrotted:
@@ -14,34 +14,45 @@ include Makefile-vars
 #	fi
 #	@echo "Finished configuring..to use, add `pwd`/bin/$(platform) to your PATH."
 
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+
 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):")
+
 denounce:
 	@echo
 	@echo =======================================================================
 	@echo Installation of $(package)-$(version) was successful.
 	@echo
+ifeq "$(GREPPED_PATH)" ""
 	@echo To use, add $(bindir) to your PATH.
 	@echo
-	@if test -f share/html/index.html; then \
+endif
+	@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