[project @ 2005-01-14 22:47:29 by wolfgang]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index a70d3f4..16fcb5d 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
 
 # -----------------------------------------------------------------------------
@@ -327,8 +328,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 +383,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