X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMakefile;h=64863e2fba719e5f501302523f3e49cbfb3906c6;hb=f9c199a1a2865bdb9e8fb318a48058d7e4bfaf64;hp=ee1b962f79d00302b2c832da8ce87395ff0b2973;hpb=03243ed63f52a5f0fe0964fb2e777ffe12010ff1;p=ghc-hetmet.git

diff --git a/distrib/Makefile b/distrib/Makefile
index ee1b962..64863e2 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -1,8 +1,9 @@
 
 include Makefile-vars
 
-.PHONY: in-place mk-version-symlinks install
+.PHONY: install postinstall denounce show-install-setup
 
+#.PHONY: in-place
 # This has bitrotted:
 #in-place ::
 #	@if test -x "./post-inplace-script" ; then \
@@ -15,20 +16,19 @@ include Makefile-vars
 
 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
-
-.PHONY: 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 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 :: postinstall denounce
 
 denounce:
 	@echo
@@ -59,20 +59,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) 
-