X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=50cd5184c278fba68470deaeead0ff4a0ddd98a1;hb=5a82864902fc01cf8eee847fcf4ee88e74aa535d;hp=9ff8db44b10134be0f1535f55ceeb4a198b932a7;hpb=8a7dbb3c7dca35a840ed11d85f7c2ea459cf3699;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 9ff8db4..50cd518 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -67,7 +67,6 @@ SUBDIRS += $(wildcard mtl)
 SUBDIRS += $(wildcard time)
 SUBDIRS += $(wildcard stm)
 SUBDIRS += $(wildcard xhtml)
-SUBDIRS += $(wildcard cgi)
 SUBDIRS += $(wildcard parallel)
 SUBDIRS_BUILD += $(wildcard dph/dph-base)
 SUBDIRS_BUILD += $(wildcard dph/dph-prim-interface)
@@ -120,6 +119,8 @@ ihtmldir            = $(htmldir)/libraries/$$pkg
 html_installed_root = $(htmldir)/libraries
 endif
 
+IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages
+
 ifneq "$(DOING_BIN_DIST)" "YES"
 
 CONFIGURE_OPTS =
@@ -147,8 +148,6 @@ subdirs:
 
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
-IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages
-
 CABAL_GHC_FLAGS = -Wall
 ifeq "$(ghc_ge_605)" "NO"
 CABAL_GHC_FLAGS += -cpp
@@ -164,6 +163,7 @@ BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir
 boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf
 
 cabal-bin: cabal-bin.hs
+	mkdir $(HERE_ABS)/bootstrapping
 	$(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin
 
 bootstrapping.conf: cabal-bin
@@ -312,7 +312,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
 	-cd filepath && $(CABAL) clean --distpref=dist-bootstrapping
 	-cd Cabal    && $(CABAL) clean --distpref=dist-bootstrapping
 	-cd hpc      && $(CABAL) clean --distpref=dist-bootstrapping
-	$(RM) -rf bootstrapping/*
+	$(RM) -rfd bootstrapping
 	$(RM) -f bootstrapping.conf     bootstrapping.conf.old
 	$(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old
 	$(RM) -f cabal-bin cabal-bin.exe
@@ -364,40 +364,29 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: ifBuildable/ifBuildable
 	if $(IFBUILDABLE) $*; then \
 	  cd $* && \
-	  $(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
+	  $(INSTALL_PACKAGE) install '$(DESTDIR)$(bindir)/ghc-pkg' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
 	fi
 
 .PHONY: binary-dist binary-dist.library.%
 
 BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries
 
+BINDIST_EXTRAS += ifBuildable/ifBuildable
 binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
-	mkdir                               $(BIN_DIST_LIBDIR)/ifBuildable
-	cp 	  ifBuildable/ifBuildable       $(BIN_DIST_LIBDIR)/ifBuildable
-	cp    Makefile                      $(BIN_DIST_LIBDIR)
+	echo $(WHERE_AM_I)/Makefile >> $(BIN_DIST_LIST)
+# XXX This needs to be changed: This ifBuildable is built with the
+# bootstrapping compiler, so isn't OS X friendly. It should be made into
+# a Cabal package if we keep it. However, once we drop extralibs we can
+# probably remove it anyway.
+	echo $(WHERE_AM_I)/ifBuildable/ifBuildable >> $(BIN_DIST_LIST)
 ifeq "$(HADDOCK_DOCS)" "YES"
-	cp    gen_contents_index            $(BIN_DIST_LIBDIR)
-	cp    index.html                    $(BIN_DIST_LIBDIR)
-	cp    doc-index*.html               $(BIN_DIST_LIBDIR)
+	for FILE in gen_contents_index index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done
 endif
-	cp -pR stamp                         $(BIN_DIST_LIBDIR)
 
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
 binary-dist.library.%:
 	if $(IFBUILDABLE) $*; then \
-	  $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*; \
-	  cd $* && \
-	  cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \
-	  cp    LICENSE       $(BIN_DIST_LIBDIR)/$* && \
-	  cp -R dist          $(BIN_DIST_LIBDIR)/$* && \
-	  $(FIND) . -name "*.buildinfo" -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \
-	  $(FIND) . -name unbuildable -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \
-	  (cp -RL include      $(BIN_DIST_LIBDIR)/$* || true) && \
-	  $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
-	     \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \
-	  $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
-	     \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \
-	     -exec rm {} \; ; \
+	  $(MAKE) -C $* -f Makefile.local binary-dist BINDIST_EXTRAS="$*.cabal LICENSE $*.buildinfo unbuildable" WHERE_AM_I=$(WHERE_AM_I)/$*; \
 	fi
 
 # Ignore some doc targets that we don't support