[project @ 2005-01-20 14:22:19 by simonmar]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index a70d3f4..0bfbf0e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,8 @@ ifneq "$(Project)" ""
                ProjectDirectory=$(Project)
        endif
    endif
-   include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk
+   -include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk
+   -include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/version.mk
 endif
 
 # -----------------------------------------------------------------------------
@@ -76,6 +77,8 @@ build ::
 
 ifeq "$(findstring ghc, $(SUBDIRS))" "ghc"
 
+.PHONY: stage1 stage2 stage3 bootstrap bootstrap2 bootstrap3
+
 stage1 : build
 
 stage2 :
@@ -87,8 +90,12 @@ stage3 :
        $(MAKE) -C ghc/compiler stage=3
 
 bootstrap  : bootstrap2
-bootstrap2 : stage1 stage2
-bootstrap3 : stage1 stage2 stage3
+
+bootstrap2 : stage1
+       $(MAKE) stage2
+
+bootstrap3 : bootstrap2
+       $(MAKE) stage3
 
 all :: bootstrap
 
@@ -260,6 +267,7 @@ binary-dist::
        echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "PACKAGE_PRL_SCRIPTS = $($(Project)BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "PACKAGE_LIB_PRL_SCRIPTS = $($(Project)BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_LIB_SPLICED_FILES = $($(Project)BinDistLibSplicedFiles)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "PACKAGE_BINS = $($(Project)BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "PACKAGE_LINKS = $($(Project)BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
@@ -327,8 +335,10 @@ endif
 ifneq "$($(Project)BinDistShScripts)" ""
 binary-dist::
        @for i in $($(Project)BinDistShScripts); do \
-            echo "Renaming $$i to $$i.sh"; \
-           $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \
+           if test -x $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i ; then \
+               echo "Renaming $$i to $$i.sh"; \
+               $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \
+           fi \
        done
 endif
 
@@ -380,7 +390,8 @@ SRC_DIST_FILES += \
        aclocal.m4 README Makefile install-sh \
        mk/bootstrap.mk \
        mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
-       mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk
+       mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk \
+       mk/fptools.css
 
 dist dist-manifest dist-package :: project-check