X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=784574b71713a7237ef5d25931894b801fa43737;hb=2772264a7e053f4624c98f0982bd8d07ad990f25;hp=ff7c6d2d92e3012f63557a1e93b2f6926720a87f;hpb=21cbb725773ae902f2494f8aa908c11020b664c7;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index ff7c6d2..784574b 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 \ @@ -268,8 +267,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,13 +290,18 @@ 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 + 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 @@ -328,7 +332,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 # -----------------------------------------------------------------------------