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

diff --git a/distrib/Makefile b/distrib/Makefile
index 3cbacc2..7f8add1 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -1,8 +1,9 @@
 
 include Makefile-vars
 
-.PHONY: in-place mk-version-symlinks install
+.PHONY: install-strip install postinstall denounce show-install-setup
 
+#.PHONY: in-place
 # This has bitrotted:
 #in-place ::
 #	@if test -x "./post-inplace-script" ; then \
@@ -13,35 +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)
-	(cd lib/$(platform); find . -type d -exec sh -c '$(INSTALL_DIR) $$0 $(libdir)/$$0' {} \; )
-	(cd share; find . -type d -exec sh -c '$(INSTALL_DIR) $(datadir)/$$0' {} \; )
+	$(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 compiler  install DOING_BIN_DIST=YES
-	$(INSTALL_DATA) $(INSTALL_OPTS) extra-gcc-opts $(libdir)
+	$(MAKE) -C includes  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) settings $(libdir)
 
-install :: install-docs postinstall denounce
+install :: postinstall denounce
 
-.PHONY: 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
@@ -60,20 +71,3 @@ show-install-setup:
 	@echo "libdir  = $(libdir) (libdir  = $(libdir))"
 	@echo "datadir = $(datadir) (datadir = $(datadir))"
 
-#
-# Documentation targets: install-docs.
-#
-
-.PHONY: show-install-setup install-docs install-dirs-docs
-
-install-docs : install-dirs-docs
-	if test -d share/html ; then $(CP) -r share/html/* $(htmldir) ; fi
-	set -e; for i in share/*.ps; do \
-		if test -f "$$i"; then \
-		      $(CP) $$i $(psdir) ; \
-		fi \
-	done
-
-install-dirs-docs:
-	$(INSTALL_DIR) $(htmldir) 
-