summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorsven.panne@aedion.de <unknown>2007-09-23 09:43:58 +0000
committersven.panne@aedion.de <unknown>2007-09-23 09:43:58 +0000
commit091868cfcf246aca64d80c779fa48c903c24831d (patch)
treeccd15361b943bd3990559ed11e3beea750ecbfce /Makefile
parent34690bfd1e7a0e3a1cde6d688d4ba2e6f9170b69 (diff)
downloadhaskell-091868cfcf246aca64d80c779fa48c903c24831d.tar.gz
Unbreak "dist" target for fresh trees
The previous hack to include Parser.hs in source distros broke the possibility of doing a "make dist" in a fresh tree, i.e. one which has just been checked out and configured, but *not* built. Of course you will need Happy for such a source distro later, but at least the freedom to do this is important. The ultimate goal should be that something like "make dist" will work in a freshly checked out tree, with no prerequisite steps (this is very common in most projects). We should move towards that goal, not away from it... MERGE TO STABLE
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ac67427664..492cc77a03 100644
--- a/Makefile
+++ b/Makefile
@@ -506,7 +506,7 @@ dist ::
&& for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(FPTOOLS_TOP_ABS)/$$i ); done \
&& for i in $(SRC_DIST_FILES); do $(LN_S) $(FPTOOLS_TOP_ABS)/$$i .; done \
&& $(MAKE) distclean \
- && $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ \
+ && if test -f $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; fi \
&& $(RM) -rf compiler/stage[123] mk/build.mk \
&& $(FIND) $(SRC_DIST_DIRS) \( -name _darcs -o -name SRC -o -name "autom4te*" -o -name "*~" -o -name ".cvsignore" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" \) -print | xargs $(RM) -rf \
)