X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=29079961f37cd368219b8c4114c572dd7a318230;hp=53a13e6a77dcb28adcd3e078fd4253f2d3e81027;hb=4e0972788c3a67337b1671e46692fbf18c5f504d;hpb=c30bedd511c983b5f2b0dae4d4cc5a2baa1cb0c2

diff --git a/libraries/Makefile b/libraries/Makefile
index 53a13e6..2907996 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -246,11 +246,7 @@ FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
                                  $(space)--configure-option=',\
                                  $(space)$(CONFIGURE_ARGS))
 
-$(foreach SUBDIR,$(SUBDIRS), \
-		  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
-stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
-	-$(RM) -f stamp/configure.library.*.$* $*/unbuildable
-	( cd $* && setup/Setup configure \
+ALL_CONFIGURE_FLAGS = \
 	           $(CONFIGURE_OPTS) \
 	           --prefix=/NONEXISTANT \
 	           --bindir=/NONEXISTANT \
@@ -268,7 +264,13 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	           --haddock-options="--use-contents=../index.html \
 	                           --use-index=../doc-index.html" \
 	           $(FLAGGED_CONFIGURE_ARGS) \
-	           --configure-option=--with-cc=$(CC) ) \
+	           --configure-option=--with-cc=$(CC)
+
+$(foreach SUBDIR,$(SUBDIRS), \
+		  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
+stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
+	-$(RM) -f stamp/configure.library.*.$* $*/unbuildable
+	( cd $* && setup/Setup configure $(ALL_CONFIGURE_FLAGS) ) \
 	      && touch $@ || touch $*/unbuildable
 # We don't touch $@ if configure failed as we would prefer to try
 # configuring it next time round, rather than assuming it'll still fail.