Update .darcs-boring for the new libraries, plus some other odds and ends

[ghc-hetmet.git] / distrib / Makefile

diff --git a/distrib/Makefile b/distrib/Makefile
index a157672..951ec7e 100644 (file)
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -27,6 +27,7 @@ install::
        $(MAKE) -C rts       install      DOING_BIN_DIST=YES
        $(MAKE) -C libraries install      DOING_BIN_DIST=YES
        $(MAKE) -C compiler  install      DOING_BIN_DIST=YES
+       $(MAKE) -C ghc       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 +35,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
+ifneq "$(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