X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=2b1e5ab049759ee4cdc54a713b19da4f7d3960bb;hb=57d15e1c1b85a8ec417e843827e5c8d271f7b1da;hp=01d02ff6c04e540a5a5b5c967e832d84d94d6d55;hpb=c532ff608cf445768bc122c355579563c7cb7ed8;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 01d02ff..2b1e5ab 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,6 @@ BIN_DIST_TOP= distrib/Makefile-bin.in \
 	      distrib/INSTALL \
 	      $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
 	      $(BIN_DIST_MAIN_DIR)/VERSION \
-	      $(BIN_DIST_MAIN_DIR)/RELEASE \
 	      $(BIN_DIST_MAIN_DIR)/LICENSE \
 	      $(BIN_DIST_MAIN_DIR)/README \
 	      glafp-utils/mkdirhier/mkdirhier \
@@ -161,7 +160,6 @@ binary-dist::
 BINDIST_DOCS = $($(Project)BinDistDocs)
 BINDIST_DOCS_WAYS = html ps
 
-ifeq "$(HOSTPLATFORM)" "i386-unknown-linux"
 binary-dist ::
 	@for way in $(BINDIST_DOCS_WAYS); do \
 	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way; \
@@ -180,7 +178,6 @@ binary-dist ::
 	   done; \
 	done
 	@rm -f .doclog
-endif
 
 # Rename scripts to $i.prl and $i.sh where necessary.
 # ToDo: do this in a cleaner way...
@@ -268,8 +265,8 @@ dist ::
 	-rm -f $(SRC_DIST_NAME).tar.gz
 	mkdir $(SRC_DIST_DIR)
 	mkdir $(SRC_DIST_DIR)/mk
-	( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -name tests -prune -o -exec mkdir $(SRC_DIST_DIR)/{} \; \) ; )
-	( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name tests -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -exec $(LN_S) $(FPTOOLS_TOP_ABS)/{} $(SRC_DIST_DIR)/{} \; )
+	( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh )
+	( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name tests -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh )
 
 # Automatic generation of a MANIFEST file for a source distribution
 # tree that is ready to go.
@@ -291,19 +288,38 @@ dist-package-zip ::
 # HC file bundles
 
 hc-file-bundle : project-check
-	$(RM) $(ProjectNameShort)-$(ProjectVersion)
+	$(RM) -r $(ProjectNameShort)-$(ProjectVersion)
 	$(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
 	find $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
 	     $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
-             $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
-             $(ProjectNameShort)-$(ProjectVersion)/hslibs \
+	     $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
+	     $(ProjectNameShort)-$(ProjectVersion)/hslibs \
 	  -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" > hc-files-to-go
-	tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar `cat hc-files-to-go`
+	find $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
+	     $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
+	     $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
+	     $(ProjectNameShort)-$(ProjectVersion)/hslibs \
+	  -name "*.hsc" | sed 's/hsc$$/hs/g' >> hc-files-to-go
+	tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
+
+CLEAN_FILES += hc-files-to-go *-hc.tar.gz
 
 # -----------------------------------------------------------------------------
 
 DIST_CLEAN_FILES += config.cache config.status
 
+#
+# If you've ended up using an in-place version of Happy,
+# make sure it gets built early on.
+#
+ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace"
+all :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
+
+$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace :
+	cd ghc/includes && make boot
+	cd happy && make boot all
+endif
+
 all ::
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
 	for i in $(SUBDIRS); do \
@@ -326,7 +342,20 @@ install ::
 	      fi; \
 	done
 
-NO_ALL_TARGETS=YES
+install-docs ::
+	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
+	for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
+	   if [ -d $$i ]; then \
+	      $(MAKE) -C $$i install-docs; \
+	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+	      fi; \
+	done
+
+# Turn off target.mk's rules for 'all', 'boot' and 'install'.
+NO_BOOT_TARGET=YES
+NO_ALL_TARGET=YES
+NO_INSTALL_TARGET=YES
+
 include $(TOP)/mk/target.mk
 
 # -----------------------------------------------------------------------------