X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMakefile-bin.in;h=431ed1fd72799ffdba62b8b97134d5a19e95c27b;hb=81d83f2f8e00967048fa8971e94f8bcd89598773;hp=b11b3702c83382e1fd25b53ffeda05da7f2d574d;hpb=4ca3e08460d0b824cc819fdfb910116858dbcb3f;p=ghc-hetmet.git

diff --git a/distrib/Makefile-bin.in b/distrib/Makefile-bin.in
index b11b370..431ed1f 100644
--- a/distrib/Makefile-bin.in
+++ b/distrib/Makefile-bin.in
@@ -38,15 +38,11 @@
 #     if it clashes with your reality, I guess.
 #
 #  * htmldir
-#     where to install the documentation HTML files.
-#  * dvidir
-#     where to install the DVI files.
-#  * infodir
-#     where to install the Emacs info 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').
+#     where to install the HTML documentation files.
+#  * pdfdir
+#     where to install the PDF documentation files.
+#  * psdir
+#     where to install the Postscript documentation files.
 #
 # For more complete instructions, consult the INSTALL file
 # that came with the bundle, and/or consult the installation
@@ -66,9 +62,9 @@ prefix      = @prefix@
 exec_prefix = @exec_prefix@
 
 # default
-infodir   = $(datadir)
-htmldir   = $(datadir)
-dvidir    = $(datadir)
+htmldir     = $(datadir)/html
+psdir       = $(datadir)
+pdfdir      = $(datadir)
 
 
 PERL        = @PerlCmd@
@@ -171,19 +167,15 @@ config-pkgs ::
 	  fi; \
 	done
 
-# Convert pwd's UNC reported path into DOS style
-# (cygwin32 only.)
-CURRENT_DIR = $(shell pwd | sed 's|^//\(.\)|\1:|' )
-
 in-place ::
-	$(MAKE) $(MFLAGS) config-pkgs bindir=$(CURRENT_DIR)/bin/$(platform) libdir=$(CURRENT_DIR)/lib/$(platform) datadir=$(CURRENT_DIR)/share
+	$(MAKE) $(MFLAGS) config-pkgs bindir=`pwd`/bin/$(platform) libdir=`pwd`/lib/$(platform) datadir=`pwd`/share
 	if test -x "./post-inplace-script" ; then \
 		echo "Running project-specific post-inplace script ..." ; \
-		./post-inplace-script $(platform) $(CURRENT_DIR) \
+		./post-inplace-script $(platform) `pwd` \
 			$(package)-$(version); \
 		echo "Done" ; \
 	fi
-	@echo "Finished configuring..to use, add $(CURRENT_DIR)/bin/$(platform) to your PATH."
+	@echo "Finished configuring..to use, add `pwd`/bin/$(platform) to your PATH."
 
 install-dirs ::
 	$(INSTALL_DIR) $(bindir)
@@ -196,17 +188,19 @@ install :: config-pkgs install-dirs install-bin install-libs install-datas insta
 
 denounce:
 	@echo
-	@echo Installation of ghc-5.00 was successful.
+	@echo =======================================================================
+	@echo Installation of $(package)-$(version) was successful.
+	@echo
 	@echo To use, add $(bindir) to your PATH.
-	@if test -d html ; then \
-	   echo Docs: ;\
-	   echo "   GHC User Guide  is $(htmldir)/set/book-users-guide.html" ; \
-	   echo "   Libraries Guide is $(htmldir)/set/book-hslibs.html" ; \
-	   echo "   .ps form of both is in $(htmldir)/set/set.ps" ; \
-	   echo ; \
+	@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!" ; \
 	fi
+	@echo =======================================================================
 
 postinstall:
 	@if test -x "./post-install-script" ; then \
@@ -258,8 +252,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/set.ps ; then $(CP) ps/set.ps $(htmldir)/set/set.ps ; 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)