X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=2216c968c56ce19765fa8a2c2702d0cd7b497679;hb=bb7ffa1642e2110e26e1243c42a8a24adafa985d;hp=d7da0c170db9d4b09b7877c360fa6fc5a73e7ba7;hpb=3b3fee836284d09422562e1df88febcfb3200eb9;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index d7da0c1..2216c96 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -143,9 +143,6 @@ CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
-DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \
-                  $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
-
 .PHONY: subdirs
 
 subdirs:
@@ -160,7 +157,10 @@ ifeq "$(ghc_ge_605)" "NO"
 CABAL_GHC_FLAGS += -cpp
 endif
 
-BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=1,3 -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc
+# Euch, hideous hack:
+CABAL_VERSION = $(shell grep "^Version:" Cabal/Cabal.cabal | sed -e "s/^Version: //" -e 's/\./,/g')
+
+BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc
 
 .PHONY: boot
 
@@ -185,21 +185,12 @@ bootstrapping.conf: cabal-bin
 	cd hpc    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
 	mv $@.tmp $@
 
-installPackage/installPackage: installPackage.hs
-	-$(RM) -rf installPackage
-	mkdir installPackage
-	$(CP) installPackage.hs installPackage/
-	cd installPackage && $(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \
-	                         --make installPackage -o installPackage \
-	                         $(DEPLOYMENT_OPTS)
-
 ifBuildable/ifBuildable: ifBuildable.hs
 	-$(RM) -rf ifBuildable
 	mkdir ifBuildable
 	$(CP) ifBuildable.hs ifBuildable/
 ifeq "$(stage)" "2"
-	cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable \
-	   	       	         $(DEPLOYMENT_OPTS)
+	cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
 else
 	cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
 endif
@@ -223,8 +214,7 @@ remake.library.%: clean.library.% make.library.%
 
 # NB. we're depending on make chasing dependencies from left to right here.
 # This bit goes wrong with 'make -j'.
-build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) \
-       installPackage/installPackage
+build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR))
 
 configure: $(foreach SUBDIR,$(SUBDIRS), \
              stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR))
@@ -236,7 +226,9 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 # makes that difficult.
 
 ALL_CONFIGURE_FLAGS = \
-               $(INSTALL_CONFIGURE_FLAGS) \
+               $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+               $(USE_STAGE1_CONFIGURE_FLAGS) \
+               $(COMMON_CONFIGURE_FLAGS) \
 	           --haddock-options="--use-contents=../index.html \
 	                              --use-index=../doc-index.html" \
 	           $(CONFIGURE_OPTS)
@@ -328,7 +320,6 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
 	$(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old
 	$(RM) -f cabal-bin cabal-bin.exe
 	$(RM) -rf ifBuildable
-	$(RM) -rf installPackage
 	$(RM) -f libraries.txt index.html doc-index.html doc-index*.html
 	$(RM) -f haddock* *.gif
 
@@ -373,20 +364,17 @@ install-docs:
 # overridden when installing a bindist.
 
 $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
-install.library.%: installPackage/installPackage ifBuildable/ifBuildable
+install.library.%: ifBuildable/ifBuildable
 	if $(IFBUILDABLE) $*; then \
 	  cd $* && \
-	  $(FPTOOLS_TOP_ABS)/libraries/installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
+	  $(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/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
 
-binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) \
-             installPackage/installPackage
-	mkdir                               $(BIN_DIST_LIBDIR)/installPackage
-	cp 	  installPackage/installPackage $(BIN_DIST_LIBDIR)/installPackage
+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)