Define CABAL in mk/cabal-flags.mk, rather than everywhere we use it

diff --git a/libraries/Makefile b/libraries/Makefile
index ed8bb94..65778ee 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -154,7 +154,6 @@ subdirs:
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
 IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages
-CABAL=$(HERE_ABS)/cabal-bin $(GHC) $(HERE_ABS)/bootstrapping.conf
 
 CABAL_GHC_FLAGS = -Wall
 ifeq "$(ghc_ge_605)" "NO"

diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index 7a9f9f0..9b2ed2a 100644 (file)
--- a/mk/cabal-flags.mk
+++ b/mk/cabal-flags.mk
@@ -2,6 +2,9 @@
 nothing=
 space=$(nothing) $(nothing)
 
+LIBRARIES_ABS = $(FPTOOLS_TOP_ABS)/libraries
+CABAL = $(LIBRARIES_ABS)/cabal-bin $(GHC) $(LIBRARIES_ABS)/bootstrapping.conf
+
 # We rely on all the CONFIGURE_ARGS being quoted with '...', and there
 # being no 's inside the values.
 FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\

diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile
index 699aa80..2971779 100644 (file)
--- a/utils/hsc2hs/Makefile
+++ b/utils/hsc2hs/Makefile
@@ -7,9 +7,6 @@ include $(TOP)/mk/cabal-flags.mk
 #     that are not -Wall clean!
 # SRC_HC_OPTS      += -Wall
 
-CABAL = $(FPTOOLS_TOP_ABS)/libraries/cabal-bin \
-            $(GHC) $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf
-
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 INSTALL_FLAGS =
 else