X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=d4b93cc023f6ae93df26acc3246e2da826480f5d;hb=d0a4736028a4834f6ce643a0629c7b5f1f451d34;hp=b03289b105f31496abc12ae01055f549399d6acd;hpb=06decfcd62d1ca9069cd4707115ecb92bea39064;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index b03289b..d4b93cc 100644 --- a/Makefile +++ b/Makefile @@ -66,11 +66,6 @@ endif SUBDIRS = $(SUBDIRS_NOLIB) libraries -VERSION : - echo $(ProjectVersion) >VERSION - -all :: VERSION - # Sanity check that all the core libraries are in the tree, to catch # failure to run darcs-all. check-packages : @@ -388,8 +383,8 @@ binary-dist :: ifneq "$(PublishLocation)" "" binary-dist :: @for i in 0 1 2 3 4 5 6 7 8 9; do \ - echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)"; \ - if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation); then break; fi\ + echo "Try $$i: $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation)"; \ + if $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation); then break; fi\ done endif @@ -442,6 +437,11 @@ EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/libraries/%, $(shell cat libraries/ext SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2 SRC_DIST_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2 +VERSION : + echo $(ProjectVersion) >VERSION + +dist :: VERSION + dist :: $(RM) -rf $(SRC_DIST_DIR) $(RM) $(SRC_DIST_NAME).tar.gz