[project @ 2001-09-24 11:27:31 by simonmar]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 5fc80eb..9b506b3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -268,8 +268,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 -name tests -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,7 +291,7 @@ 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 \
@@ -302,7 +302,7 @@ hc-file-bundle : project-check
             $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
             $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
             $(ProjectNameShort)-$(ProjectVersion)/hslibs \
-         -name "*.hsc" | sed 's/hsc$/hs$/g' >> hc-files-to-go
+         -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