X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMakefile;h=f1d63bc28edf7251d1877a344e7e69160b124339;hb=46809fa91667e952afe016e4cd704b21274241b4;hp=a1576727058837a5a985f059ff04e748481ab5e6;hpb=eacaba4cdec861c4fc412b9ec2c962bc9b55a87d;p=ghc-hetmet.git

diff --git a/distrib/Makefile b/distrib/Makefile
index a157672..f1d63bc 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -19,14 +19,18 @@ 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
@@ -34,17 +38,21 @@ install::
 
 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