projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5ed560b
)
More libraries/Makefile fixes
author
Ian Lynagh
<igloo@earth.li>
Thu, 3 Jul 2008 14:10:16 +0000
(14:10 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Thu, 3 Jul 2008 14:10:16 +0000
(14:10 +0000)
libraries/Makefile
patch
|
blob
|
history
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
faa946d
..
8983a8d
100644
(file)
--- 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
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 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 $@
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) -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
$(RM) -rf ifBuildable
$(RM) -rf installPackage
$(RM) -f libraries.txt index.html doc-index.html doc-index*.html