X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMakefile;h=a1576727058837a5a985f059ff04e748481ab5e6;hb=db54c49c5bbff861e1b8172b7d5477ce99223cae;hp=d60e1117f6970af402825eb73b8e4275c1ad2a58;hpb=094f9feafaf83190891736ddd8d1d7213f4293c4;p=ghc-hetmet.git

diff --git a/distrib/Makefile b/distrib/Makefile
index d60e111..a157672 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -1,33 +1,38 @@
 
 include Makefile-vars
 
-.PHONY: in-place mk-version-symlinks install-dirs install
+.PHONY: install-strip install postinstall denounce show-install-setup
 
-in-place ::
-	@if test -x "./post-inplace-script" ; then \
-		echo "Running project-specific post-inplace script ..." ; \
-		./post-inplace-script $(platform) `pwd` \
-			$(package)-$(version); \
-		echo "Done" ; \
-	fi
-	@echo "Finished configuring..to use, add `pwd`/bin/$(platform) to your PATH."
+#.PHONY: in-place
+# This has bitrotted:
+#in-place ::
+#	@if test -x "./post-inplace-script" ; then \
+#		echo "Running project-specific post-inplace script ..." ; \
+#		./post-inplace-script $(platform) `pwd` \
+#			$(package)-$(version); \
+#		echo "Done" ; \
+#	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::
-	$(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 :: install-docs postinstall denounce
+	$(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
+	$(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)
 
-.PHONY: postinstall denounce
+install :: postinstall denounce
 
 denounce:
 	@echo
@@ -58,20 +63,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) 
-