X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=881cfc2c2c232a17460b9d257cf7b30ca2a92c06;hb=8ca46317605d42e01562308dbd32dadea6bb780f;hp=694adae8d02a36de7306dc99fa58ea354f5df27e;hpb=5c789e424c1461c1dadfd38c44fcb9e8f38bf755;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 694adae..881cfc2 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -12,8 +12,7 @@ TOP=.
 include $(TOP)/mk/boilerplate.mk
 endif
 
-SUBDIRS = base filepath haskell98 template-haskell readline \
-	  regex-base regex-posix regex-compat parsec Cabal
+SUBDIRS = base filepath haskell98 template-haskell readline Cabal
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -25,6 +24,10 @@ endif
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
 ifneq "$(GhcBootLibs)" "YES"
+SUBDIRS += $(wildcard regex-base)
+SUBDIRS += $(wildcard regex-posix)
+SUBDIRS += $(wildcard regex-compat)
+SUBDIRS += $(wildcard parsec)
 SUBDIRS += $(wildcard haskell-src)
 SUBDIRS += $(wildcard html)
 SUBDIRS += $(wildcard network)
@@ -99,7 +102,7 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
 
 stamp/$(BOOTSTRAPPING_CABAL):
 	$(RM) -rf $(BOOTSTRAPPING_CABAL)
-	$(CP) -a Cabal $(BOOTSTRAPPING_CABAL)
+	$(CP) -R Cabal $(BOOTSTRAPPING_CABAL)
 	$(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \;
 	touch $@