X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=b3f98081573351ced6950a6b2442706a6cdfc76d;hb=c1681a73fa4ca4cf8758264ae387ac09a9e900d8;hp=6e4361cee6a559fc408fb89ffe02edf92a5a5947;hpb=64ecde3da5244d080977123c6fc3c8f82d2a6918;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 6e4361c..b3f9808 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -35,8 +35,8 @@ default_target: all
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = base old-locale old-time directory process filepath pretty \
-          template-haskell readline Cabal random haskell98
+SUBDIRS = base old-locale old-time filepath directory process pretty \
+          hpc template-haskell readline Cabal random haskell98
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -190,10 +190,21 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 # the executable with the shell script on non-Windows. This should
 # probably be tidied up so that we can always pass the same libsubdir.
 ifeq "$(Windows)" "YES"
-libsubdir = $$pkgid
+DATA_REL_DIR = .
+datadir      = $$prefix
+libsubdir    = $$pkgid
 else
-libsubdir = $$compiler/lib/$$pkgid
+DATA_REL_DIR = share/ghc
+datadir      = $$prefix/share/ghc
+libsubdir    = $$compiler/lib/$$pkgid
 endif
+DOC_ROOT     = $(prefix)/$(DATA_REL_DIR)/doc/html/
+
+# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
+# being no 's inside the values.
+FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
+                                 $(space)--configure-option=',\
+                                 $(space)$(CONFIGURE_ARGS))
 
 $(foreach SUBDIR,$(SUBDIRS), \
 		  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
@@ -202,16 +213,16 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	( cd $* && setup/Setup configure \
 	           $(CONFIGURE_OPTS) \
 	           --prefix='$$topdir' \
-	           --datadir='$$prefix/share' \
+	           --datadir='$(datadir)' \
+	           --datasubdir='.' \
 	           --libsubdir='$(libsubdir)' \
 	           --with-compiler=../../compiler/stage1/ghc-inplace$ \
 	           --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \
 	           --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
 	           --with-ld=$(LD) \
-	           --datasubdir=ghc \
 	           --haddock-args="--use-contents=../index.html \
 	                           --use-index=../doc-index.html" \
-	           $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
+	           $(FLAGGED_CONFIGURE_ARGS) \
 	           --configure-option=--with-cc=$(CC) ) \
 	      && touch $@ || touch $*/unbuildable
 # We don't touch $@ if configure failed as we would prefer to try
@@ -224,10 +235,7 @@ $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
 make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
 		%/GNUmakefile \
                 %/setup/Setup ifBuildable/ifBuildable
-#       HACK: invoke make via $(SHELL), otherwise on Windows it apparently
-#       gets argv[0] set to "make" (with quotes), which causes a problem
-#       when make re-invokes itself after creating .depend.  Ugh.
-	ifBuildable/ifBuildable $* $(SHELL) -c $(MAKE)
+	ifBuildable/ifBuildable $* $(MAKE)
 	ifBuildable/ifBuildable $* setup/Setup register --inplace
 
 # Build the library using 'setup build' (not the default)
@@ -264,6 +272,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
 	$(RM) -f stamp/bootstrapping.*
 	$(RM) -rf bootstrapping.*
 	$(RM) -rf ifBuildable
+	$(RM) -rf installPackage
 	$(RM) -f libraries.txt index.html doc-index.html
 
 $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
@@ -278,17 +287,15 @@ endif
 
 .PHONY: install install-docs install.library.%
 
-ROOT=$(prefix)/share/ghc/doc/html/
-
 install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
 ifeq "$(HADDOCK_DOCS)" "YES"
-	$(INSTALL_DIR)                                            $(ROOT)
-	$(INSTALL_DATA)   index.html doc-index.html               $(ROOT)
-	$(INSTALL_SCRIPT) gen_contents_index                      $(ROOT)
+	$(INSTALL_DIR)                              $(DOC_ROOT)
+	$(INSTALL_DATA)   index.html doc-index.html $(DOC_ROOT)
+	$(INSTALL_SCRIPT) gen_contents_index        $(DOC_ROOT)
 	# Hacks:
-	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.css $(ROOT)
-	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.js  $(ROOT)
-	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.gif $(ROOT)
+	$(INSTALL_DATA)   $(DOC_ROOT)/base/*.css    $(DOC_ROOT)
+	$(INSTALL_DATA)   $(DOC_ROOT)/base/*.js     $(DOC_ROOT)
+	$(INSTALL_DATA)   $(DOC_ROOT)/base/*.gif    $(DOC_ROOT)
 endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here