If we know where alex, haddock and happy are then tell Cabal; fixes trac #2373

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 8983a8d..20161c9 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -150,6 +150,18 @@ ifneq "$(HSCOLOUR)" ""
 CONFIGURE_OPTS += --with-hscolour=$(HSCOLOUR)
 endif
 
+ifneq "$(ALEX)" ""
+CONFIGURE_OPTS += --with-alex=$(ALEX)
+endif
+
+ifneq "$(HADDOCK)" ""
+CONFIGURE_OPTS += --with-haddock=$(HADDOCK)
+endif
+
+ifneq "$(HAPPY)" ""
+CONFIGURE_OPTS += --with-happy=$(HAPPY)
+endif
+
 DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \
                   $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
 
@@ -352,6 +364,8 @@ endif
 distclean: clean
 
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
+       -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping
+       -cd Cabal    && $(CABAL) clean --distpref=dist-bootstrapping
        $(RM) -rf bootstrapping/*
        $(RM) -f bootstrapping.conf     bootstrapping.conf.old
        $(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old
@@ -368,7 +382,6 @@ $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
 clean.library.%:
        $(RM) -f stamp/configure.library.*.$* $*/unbuildable
        -cd $* && $(CABAL) clean
-       -cd $* && $(CABAL) clean --distpref=dist-bootstrapping
        $(RM) -f $*/Setup $*/Setup.exe $*/Setup.hi $*/Setup.o
        $(RM) $*/GNUmakefile $*/Makefile.local
 endif