From 8589f118d84ab137ae8673634baf7e3edc087c88 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Thu, 29 Nov 2007 02:03:09 +0000 Subject: Makefile changes: BUILDCONF and CABAL_BKP. + Changed BUILDCONF to point to dist/setup-config, not .setup-config. This is where current versions of Cabal put it. 'make clean' works again! + Do not clean up CABAL_BKP, because it might need to be recovered for a new build with a different GHC version. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1108 788f1e2b-df1e-0410-8736-df70ead52e1b --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 99581e610..63245feea 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ SRCDIR := . MANDIR := man TESTDIR := tests BUILDDIR := dist -BUILDCONF := .setup-config +BUILDCONF := $(BUILDDIR)/setup-config BUILDVARS := vars CONFIGURE := configure @@ -118,7 +118,6 @@ $(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh @$(generate-shell-script) CABAL_BACKUP=$(CABAL).orig -cleanup_files+=$(CABAL_BACKUP) $(CABAL_BACKUP): cp $(CABAL) $(CABAL_BACKUP) ; \ if echo $(GHC_VERSION) | grep -q '^6.6'; then \ -- cgit v1.2.3