[project @ 2005-01-14 16:00:55 by simonmar]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 317d982..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
 
@@ -377,10 +380,11 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 SRC_DIST_DIRS += docs distrib $(filter-out docs distrib,$(SUBDIRS))
 SRC_DIST_FILES += \
        configure.ac config.guess config.sub configure \
-       aclocal.m4 README Makefile Makefile.config install-sh \
+       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
 
@@ -404,8 +408,11 @@ dist-package :: dist-package-tar-gz
 
 SRC_DIST_PATHS = $(patsubst %, $(SRC_DIST_NAME)/%, $(SRC_DIST_FILES) $(SRC_DIST_DIRS))
 
+dist-package-tar-bz2 ::
+       BZIP2=-9 $(TAR) chjf $(SRC_DIST_NAME)-src.tar.bz2 $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.bz2
+
 dist-package-tar-gz ::
-       $(TAR) chzf $(SRC_DIST_NAME)-src.tar.gz $(SRC_DIST_NAME)
+       $(TAR) chzf $(SRC_DIST_NAME)-src.tar.gz $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.gz
 
 dist-package-zip ::
        cd ..; $(LN_S) $(FPTOOLS_TOP_ABS) $(SRC_DIST_NAME) && \