[project @ 2002-09-18 06:34:07 by mthomas]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 40e26ab..23f98a4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -218,13 +218,13 @@ binary-pack::
 
 ifneq "$(way)" ""
 package-way-dist::
-       ( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print | xargs tar cvf $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar )
+       ( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print | xargs tar cvf $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar )
        gzip $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar
 endif
 
 ifneq "$(way)" ""
 remove-way-dist::
-       ( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec rm -f {} \; )
+       ( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec rm -f {} \; )
 endif
 
 binary-dist::
@@ -294,21 +294,22 @@ dist-package-zip ::
 hc-file-bundle : project-check
        $(RM) -r $(ProjectNameShort)-$(ProjectVersion)
        $(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
-       find $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
+       $(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
             $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
-            $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
+            $(ProjectNameShort)-$(ProjectVersion)/libraries \
             $(ProjectNameShort)-$(ProjectVersion)/hslibs \
          \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
-       find $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
-            $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
-            $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
-            $(ProjectNameShort)-$(ProjectVersion)/hslibs \
-         -name "*.hsc" -print | sed 's/hsc$$/hs/g' >> hc-files-to-go
+       for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/driver $(ProjectNameShort)-$(ProjectVersion)/libraries $(ProjectNameShort)-$(ProjectVersion)/hslibs -name "*.hsc" -print` ""; do \
+            if test "x$$f" != "x" && test -e `echo "$$f" | sed 's/hsc$$/hs/g'`; then \
+               echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \
+            fi; \
+       done;
        echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
        echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/*.hs-incl >> hc-files-to-go
        echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/Parser.hs >> hc-files-to-go
+       echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/ParserCore.hs >> hc-files-to-go
        echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/main/ParsePkgConf.hs >> hc-files-to-go
-       echo $(ProjectNameShort)-$(ProjectVersion)/hslibs/hssource/HsParser.hs >> hc-files-to-go
+       echo $(ProjectNameShort)-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> 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