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:
4e09727
)
Fix the Windows build; the new Cabal doesn't like --prefix=/foo
author
Ian Lynagh
<igloo@earth.li>
Mon, 12 May 2008 17:05:07 +0000
(17:05 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Mon, 12 May 2008 17:05:07 +0000
(17:05 +0000)
libraries/Makefile
patch
|
blob
|
history
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
2907996
..
20333b1
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-246,17
+246,23
@@
FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
$(space)--configure-option=',\
$(space)$(CONFIGURE_ARGS))
$(space)--configure-option=',\
$(space)$(CONFIGURE_ARGS))
+ifeq "$(Windows)" "YES"
+NONEXISTANT=c:/NONEXISTANT
+else
+NONEXISTANT=/NONEXISTANT
+endif
+
ALL_CONFIGURE_FLAGS = \
$(CONFIGURE_OPTS) \
ALL_CONFIGURE_FLAGS = \
$(CONFIGURE_OPTS) \
- --prefix=/NONEXISTANT \
- --bindir=/NONEXISTANT \
- --libdir=/NONEXISTANT \
+ --prefix=$(NONEXISTANT) \
+ --bindir=$(NONEXISTANT) \
+ --libdir=$(NONEXISTANT) \
--libsubdir='$$pkgid' \
--libsubdir='$$pkgid' \
- --libexecdir=/NONEXISTANT \
- --datadir=/NONEXISTANT \
- --docdir=/NONEXISTANT \
- --haddockdir=/NONEXISTANT \
- --htmldir=/NONEXISTANT \
+ --libexecdir=$(NONEXISTANT) \
+ --datadir=$(NONEXISTANT) \
+ --docdir=$(NONEXISTANT) \
+ --haddockdir=$(NONEXISTANT) \
+ --htmldir=$(NONEXISTANT) \
--with-compiler=../../compiler/stage1/ghc-inplace \
--with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
--with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
--with-compiler=../../compiler/stage1/ghc-inplace \
--with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
--with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \