FIX #2302: print FastStrings in UTF-8 in error messages

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 4a75932..1fe8bc0 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -70,9 +70,6 @@ SUBDIRS += $(wildcard ALUT)
 SUBDIRS += $(wildcard stm)
 SUBDIRS += $(wildcard xhtml)
 SUBDIRS += $(wildcard cgi)
-ifeq "$(GhcLibsWithObjectIO)" "YES"
-SUBDIRS += $(wildcard ObjectIO)
-endif
 SUBDIRS += $(wildcard parallel)
 SUBDIRS_BUILD += $(wildcard ndp)
 SUBDIRS_BUILD += $(wildcard dph/dph-base)
@@ -157,7 +154,6 @@ subdirs:
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
 IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages
-CABAL=$(HERE_ABS)/cabal-bin $(GHC) $(HERE_ABS)/bootstrapping.conf
 
 CABAL_GHC_FLAGS = -Wall
 ifeq "$(ghc_ge_605)" "NO"
@@ -189,14 +185,6 @@ 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
@@ -227,8 +215,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))
@@ -239,14 +226,10 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 # We should depend on %/%.cabal here (and in other rules), but make
 # makes that difficult.
 
-ifeq "$(Windows)" "YES"
-NONEXISTENT=c:/NONEXISTENT
-else
-NONEXISTENT=/NONEXISTENT
-endif
-
 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)
@@ -338,7 +321,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
 
@@ -383,20 +365,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)' ; \
+         $(FPTOOLS_TOP_ABS)/utils/installPackage/install-inplace/bin/installPackage 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)