diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-10 13:52:13 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-10 13:52:13 +0000 |
| commit | 3b3fee836284d09422562e1df88febcfb3200eb9 (patch) | |
| tree | 482aee7101eb283183c88624f51009d39a0b5ccd | |
| parent | 145c696c44d201e57e33a308142b7f41aac611db (diff) | |
| download | haskell-3b3fee836284d09422562e1df88febcfb3200eb9.tar.gz | |
Move the definition of NONEXISTENT into the central cabal-flags.mk
| -rw-r--r-- | libraries/Makefile | 6 | ||||
| -rw-r--r-- | mk/cabal-flags.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index 65778ee053..d7da0c170d 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -235,12 +235,6 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. -ifeq "$(Windows)" "YES" -NONEXISTENT=c:/NONEXISTENT -else -NONEXISTENT=/NONEXISTENT -endif - ALL_CONFIGURE_FLAGS = \ $(INSTALL_CONFIGURE_FLAGS) \ --haddock-options="--use-contents=../index.html \ diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk index 9b2ed2a0c2..ad01deb667 100644 --- a/mk/cabal-flags.mk +++ b/mk/cabal-flags.mk @@ -35,6 +35,12 @@ endif COMMON_CONFIGURE_FLAGS += $(FLAGGED_CONFIGURE_ARGS) \ --configure-option=--with-cc=$(CC) +ifeq "$(Windows)" "YES" +NONEXISTENT=c:/NONEXISTENT +else +NONEXISTENT=/NONEXISTENT +endif + # We put non-existant paths in when configuring things that we plan to # install, as we require that builds don't depend on these paths when # making bindists. |