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
This commit is contained in:
parent
ae5697e3b4
commit
8589f118d8
1 changed files with 1 additions and 2 deletions
3
Makefile
3
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 \
|
||||
|
|
Loading…
Add table
Reference in a new issue