X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=dfe81b3d4072ccc1a7951df378c3320ca0132cf7;hb=8966ae35cc8ae7a0b415b7fe1a4f6f76efec6f92;hp=8ce10de94b0e575d0cce79d6ce3bc2bab682ca8e;hpb=a9fcc06f3e7476e56903ffbaeaab0f158d7c494c;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 8ce10de..dfe81b3 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -24,6 +24,12 @@
 
 default_target: build
 
+# make doesn't give us an easy way to get the libraries built in
+# dependency order the first time, but not rebuild base (for example)
+# when we want to rebuild another library later.
+# So for now we just don't do anything in parallel in here.
+.NOTPARALLEL:
+
 # Ideally we'd just include something to give us variables
 # for paths and arguments to tools etc, and those set in mk/build.mk.
 TOP=..
@@ -72,6 +78,7 @@ ifeq "$(GhcLibsWithObjectIO)" "YES"
 SUBDIRS += $(wildcard ObjectIO)
 endif
 SUBDIRS += $(wildcard parallel)
+SUBDIRS += $(wildcard ndp)
 endif
 
 # -----------------------------------------------------------------------------
@@ -171,6 +178,20 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 # We should depend on %/%.cabal here (and in other rules), but make
 # makes that difficult.
 
+# We explicitly set datadir to "$prefix/share" as, while that is the
+# default on Linux, on Windows it defaults to
+# "C:\\Program Files\\Common Files"
+
+# We also set libsubdir differently on Windows and non-Windows, as on
+# non-Windows the path we deduce is highre up than the path passed to
+# 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
+else
+libsubdir = $$compiler/lib/$$pkgid
+endif
+
 $(foreach SUBDIR,$(SUBDIRS), \
 		  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
 stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
@@ -178,7 +199,8 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	( cd $* && setup/Setup configure \
 	           $(CONFIGURE_OPTS) \
 	           --prefix='$$topdir' \
-	           --libsubdir='$$compiler/lib/$$pkgid' \
+	           --datadir='$$prefix/share' \
+	           --libsubdir='$(libsubdir)' \
 	           --with-compiler=../../compiler/ghc-inplace$(dot_bat) \
 	           --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$(dot_bat) \
 	           --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace$(dot_bat) \
@@ -284,7 +306,6 @@ $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
 binary-dist.library.%:
 	$(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*
 	ifBuildable/ifBuildable $* cp    $*.cabal      $(BIN_DIST_LIBDIR)/$*
-	ifBuildable/ifBuildable $* cp .setup-config    $(BIN_DIST_LIBDIR)/$*
 	ifBuildable/ifBuildable $* cp -a dist          $(BIN_DIST_LIBDIR)/$*
 	# Euch
 	ifBuildable/ifBuildable $* cp -aL include      $(BIN_DIST_LIBDIR)/$* || :