From: Ian Lynagh <igloo@earth.li>
Date: Thu, 10 Jul 2008 13:52:13 +0000 (+0000)
Subject: Move the definition of NONEXISTENT into the central cabal-flags.mk
X-Git-Tag: Before_cabalised-GHC~30
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=3b3fee836284d09422562e1df88febcfb3200eb9;p=ghc-hetmet.git

Move the definition of NONEXISTENT into the central cabal-flags.mk
---

diff --git a/libraries/Makefile b/libraries/Makefile
index 65778ee..d7da0c1 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 9b2ed2a..ad01deb 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.