X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=eb81d143ce130a9802b2034caf84a616ae53a2b1;hb=242834811c2e5c3a47e8d43ed77cec3c305434b2;hp=71f9f3171ef542470d48b391d06b59157bacaa71;hpb=ee7250f0a3b4d176501c61a5afb019a0a3d40966;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 71f9f31..eb81d14 100644
--- a/Makefile
+++ b/Makefile
@@ -10,14 +10,18 @@ TOP=.
 include $(TOP)/mk/boilerplate.mk
 SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 
-SUBDIRS = $(ProjectsToBuild)
+#
+# Totally evil hack to make the setting of SUBDIRS be dependent
+# on whether we do `make install' or not. Having a $(ifeq ... ) would
+# be preferable..
+CURRENT_TARGET = $@
+SUBDIRS = $(shell if (test x$(CURRENT_TARGET) = xinstall) ; then echo $(ProjectsToInstall); else echo $(ProjectsToBuild); fi)
 
 #
 # Files to include in fptools source distribution
 #
-SRC_DIST_DIRS += mk $(ProjectsToBuild)
-SRC_DIST_FILES += configure.in config.guess config.sub configure README ANNOUNCE NEWS INSTALL Makefile
-
+SRC_DIST_DIRS += mk docs CONTRIB distrib $(ProjectsToBuild)
+SRC_DIST_FILES += configure.in config.guess config.sub configure aclocal.m4 README ANNOUNCE INSTALL Makefile install-sh
 
 #
 # Making a binary distribution
@@ -34,10 +38,10 @@ binary-dist:: binary-dist-pre
 
 BIN_DIST_TOP= distrib/Makefile-bin.in \
 	      distrib/configure-bin.in \
-	      distrib/README \
+	      README \
 	      distrib/INSTALL \
-	      distrib/ANNOUNCE \
-	      distrib/PATCHLEVEL \
+	      ANNOUNCE \
+	      ghc/PATCHLEVEL \
 	      glafp-utils/mkdirhier/mkdirhier \
 	      ghc/RELEASE \
 	      install-sh \
@@ -53,57 +57,26 @@ binary-dist::
 	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in 
 	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
 	@echo "Generating a shippable configure script.."
-	-(cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
+	#-(cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
 
 #
-# Creating and copying the documentation into the bin-dist tree.
-# (this tries to be oh-so-general about copyng docs, but isn't really
-# suited for anything else than ghc/)
-#
-# Needless to say, the rule below could be cleaned up somewhat.
+# binary dist'ing the documentation.  
+# Which documentation to build/install is hardcoded below.
 #
-binary-dist::
-	@$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02
-	@$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02
-	@$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02
-	@echo "Making html documentation.."
-	@echo "For fptools.."
-	$(MAKE) -C docs --no-print-directory $(MFLAGS) html
-	cp -f docs/html/* docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02
-	@echo "Done."
-	@for i in $(BIN_DIST_DIRS); do \
-	   echo "For $$i.."; \
-	   echo cp -f $$i/docs/users_guide/html/* $$i/docs/users_guide/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
-	   cp -f $$i/docs/users_guide/html/* $$i/docs/users_guide/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
-	   echo cp -f $$i/docs/html/* $$i/docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
-	   cp -f $$i/docs/html/* $$i/docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
-	   echo "Done."; \
-	done
-	@echo "Making dvi files.."
-	@echo "For fptools.."
-	-$(MAKE) -C docs --no-print-directory $(MFLAGS) dvi
-	-cp -f docs/*.dvi  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02
-	@echo "Done."
-	@for i in $(BIN_DIST_DIRS); do \
-	   echo "For $$i.."; \
-	   echo cp -f $$i/docs/users_guide/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
-	   cp -f $$i/docs/users_guide/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
-	   echo cp -f $$i/docs/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
-	   cp -f $$i/docs/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
-	   echo "Done."; \
-	done
-	@echo "Making info files.."
-	@echo "For fptools.."
-	-$(MAKE) -C docs --no-print-directory $(MFLAGS) info
-	-cp -f docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02/
-	@echo "Done."
-	@for i in $(BIN_DIST_DIRS); do \
-	   echo "For $$i docs.."; \
-	   echo cp -f $$i/docs/users_guide/*.info  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
-	   cp -f $$i/docs/users_guide/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
-	   echo cp -f $$i/docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
-	   cp -f $$i/docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
-	   echo "Done."; \
+
+BINDIST_DOCS = docs ghc/docs/users_guide
+BINDIST_DOCS_WAYS = html info dvi
+
+binary-dist ::
+	@for way in $(BINDIST_DOCS_WAYS); do \
+	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(GhcProjectNameShort)-$(GhcProjectVersion); \
+	   for dir in $(BINDIST_DOCS); do \
+	     echo Making $$way documentation in $$dir; \
+	     $(MAKE) -C $$dir --no-print-directory $(MFLAGS) $$way; \
+	     echo cp -f $$dir/*.$$way $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(GhcProjectNameShort)-$(GhcProjectVersion); \
+	     cp -f $$dir/*.$$way $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way/$(GhcProjectNameShort)-$(GhcProjectVersion); \
+	     echo "Done."; \
+	   done; \
 	done
 
 #
@@ -119,7 +92,7 @@ binary-dist ::
 		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(ProjectVersion) \
 		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs \
 		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs \
-		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$$i-$(ProjectVersion) ;
+		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/ghc-$(ProjectVersion) ;
 
 # Even more of a hack, but I'm too tired to fix this up right now..
 BIN_DIST_SCRIPTS_NEEDING_RENAMING=ghc stat2resid hstags mkdependHS