X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMakefile-bin.in;h=4372ea92c7e6505c713f7cd0b18f2bbe31aa863c;hb=845db8182942e006a9164e41e9839adb39f24268;hp=4f81e71dfabec494a057a84e21cc7b8c44e705e1;hpb=42d54ccdc9a1000c36fdbf66088c6714bf8d69a2;p=ghc-hetmet.git

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index 4f81e71..4372ea9 100644
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -44,10 +44,6 @@
 #  * psdir
 #     where to install the Postscript documentation files.
 #
-# Installing the documentation is not done as part of the `install' rule, but
-# via `install-docs' (or if you want to be selective: `install-html', `install-dvi'
-# and `install-info').
-#
 # For more complete instructions, consult the INSTALL file
 # that came with the bundle, and/or consult the installation
 # documentation in one of the document directories.
@@ -66,7 +62,7 @@ prefix      = @prefix@
 exec_prefix = @exec_prefix@
 
 # default
-htmldir     = $(datadir)
+htmldir     = $(datadir)/html
 psdir       = $(datadir)
 pdfdir      = $(datadir)
 
@@ -194,8 +190,12 @@ denounce:
 	@echo
 	@echo =======================================================================
 	@echo Installation of $(package)-$(version) was successful.
+	@echo
 	@echo To use, add $(bindir) to your PATH.
-	@if test -d html ; then \
+	@echo
+	@if test -f share/html/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!" ; \
@@ -237,7 +237,9 @@ install-libs:
 	(cd lib/$(platform); find . -type f -exec sh -c '$(CP) $$0 $(libdir)/$$0' {} \; )
 
 install-datas:
-	(cd share; find . -type f -exec sh -c '$(INSTALL_DATA) $$0 $(datadir)/$$0' {} \; )
+	for i in `(cd share; find . -type f )`; do \
+	   $(INSTALL_DATA) share/$$i $(datadir)/$$i; \
+	done
 
 show-install-setup:
 	@echo "Install setup..."
@@ -252,8 +254,10 @@ show-install-setup:
 .PHONY: show-install-setup install-docs install-dirs-docs
 
 install-docs : install-dirs-docs
-	if test -d html ; then $(CP) -r html/* $(htmldir) ; fi
-	if test -f ps/*.ps ; then $(CP) ps/*.ps $(psdir) ; fi
+	if test -d share/html ; then $(CP) -r share/html/* $(htmldir) ; fi
+	for i in share/*.ps; do \
+		$(CP) $$i $(psdir) ; \
+	done
 
 install-dirs-docs:
 	$(INSTALL_DIR) $(htmldir)