From 890616c0347776ac9e5656640369be1948ec729b Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 3 Jul 2008 14:10:16 +0000 Subject: [PATCH] More libraries/Makefile fixes --- libraries/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/Makefile b/libraries/Makefile index faa946d..8983a8d 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -180,11 +180,11 @@ cabal-bin: cabal-bin.hs bootstrapping.conf: cabal-bin echo "[]" > $@.tmp -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping - cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --package-db=$@.tmp + cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --package-db=$(HERE_ABS)/$@.tmp cd filepath && $(CABAL) build --distpref=dist-bootstrapping cd filepath && $(CABAL) install --distpref=dist-bootstrapping --inplace -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping - cd Cabal && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --package-db=$@.tmp + cd Cabal && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --package-db=$(HERE_ABS)/$@.tmp cd Cabal && $(CABAL) build --distpref=dist-bootstrapping cd Cabal && $(CABAL) install --distpref=dist-bootstrapping --inplace mv $@.tmp $@ @@ -355,7 +355,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -rf bootstrapping/* $(RM) -f bootstrapping.conf bootstrapping.conf.old $(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old - $(RM) -f cabal-bin + $(RM) -f cabal-bin cabal-bin.exe $(RM) -rf ifBuildable $(RM) -rf installPackage $(RM) -f libraries.txt index.html doc-index.html doc-index*.html -- 1.7.10.4