[project @ 2001-08-27 13:11:44 by simonmar]

a couple of tweaks to the hc-file-bundle target:
  - Add -r option to ${RM} to blow away an existing binary-dist
    temporary directory if present.
  - Fix bogons in the bundle building code.

diff --git a/Makefile b/Makefile
index 5fc80eb..0a8271c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -291,7 +291,7 @@ dist-package-zip ::
 # HC file bundles
 
 hc-file-bundle : project-check
 # 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 \
        $(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 \
             $(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
        tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
 
 CLEAN_FILES += hc-files-to-go *-hc.tar.gz