X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=libraries%2FMakefile;h=30043ffa64162a9b007e172e1f61e49c14d7ce6e;hb=388ed76ebf24267cc2f9d752b7920b8c0085bec1;hp=594de168e470ae6ae9b3c34fef01e4b5945c36e0;hpb=80a290e38a1d53f8db2120dc40f362e5e4498ce6;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 594de16..30043ff 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -3,8 +3,14 @@
 
 default_target: build
 
+ifeq "$(IN_BIN_DIST)" "1"
+include ../Makefile-vars
+else
+# Ideally we'd just include something to give us variables
+# for paths and arguments to tools etc, and those set in mk/build.mk.
 TOP=.
 include $(TOP)/mk/boilerplate.mk
+endif
 
 SUBDIRS = base filepath haskell98 template-haskell readline \
 	  regex-base regex-posix regex-compat parsec Cabal
@@ -60,6 +66,11 @@ endif
 
 BOOTSTRAPPING_CABAL = bootstrapping.cabal
 
+.PHONY: subdirs
+
+subdirs:
+	@echo $(SUBDIRS)
+
 .PHONY: boot
 
 boot: $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup)