Simplify a bit of makefile

[ghc-hetmet.git] / ghc.mk

diff --git a/ghc.mk b/ghc.mk
index b47b49c..d1565e9 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -493,12 +493,10 @@ libraries/ghc-prim_dist-install_EXTRA_HADDOCK_SRCS = libraries/ghc-prim/dist-ins
 ifneq "$(CLEANING)" "YES"
 ifeq "$(INTEGER_LIBRARY)" "integer-gmp"
 libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple
+else ifeq "$(INTEGER_LIBRARY)" "integer-simple"
+libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple
 else
-    ifeq "$(INTEGER_LIBRARY)" "integer-simple"
-       libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple
-    else
 $(error Unknown integer library: $(INTEGER_LIBRARY))
-    endif
 endif
 endif
 
@@ -641,6 +639,7 @@ ghc_stage1_CONFIGURE_PHASE = 1
 driver/ghc_dist_CONFIGURE_PHASE = 1
 driver/ghci_dist_CONFIGURE_PHASE = 1
 driver/haddock_dist_CONFIGURE_PHASE = 1
+utils/touchy_dist_CONFIGURE_PHASE = 1
 
 # In phase 2, the phase 1 things actually get built
 
@@ -652,7 +651,6 @@ ghc_stage2_CONFIGURE_PHASE = 3
 $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \
   libraries/$(lib)_dist-install_CONFIGURE_PHASE = 3))
 
-utils/touchy_dist_CONFIGURE_PHASE = 3
 utils/hp2ps_dist_CONFIGURE_PHASE = 3
 utils/genapply_dist_CONFIGURE_PHASE = 3
 utils/haddock_dist_CONFIGURE_PHASE = 3