From: Ian Lynagh <igloo@earth.li>
Date: Sat, 2 Jun 2007 01:51:01 +0000 (+0000)
Subject: Explicitly set datadir
X-Git-Tag: 2007-06-12~13
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=cdf3453aa51c6387a6b8ea815a3d1745b1980d8d

Explicitly set datadir
Cabal defaults to the value we want on Linux, but uses
"C:\\Program Files\\Common Files" on Windows.
---

diff --git a/libraries/Makefile b/libraries/Makefile
index 8ce10de..ba6d547 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -171,6 +171,10 @@ 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"
+
 $(foreach SUBDIR,$(SUBDIRS), \
 		  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
 stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
@@ -178,6 +182,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	( cd $* && setup/Setup configure \
 	           $(CONFIGURE_OPTS) \
 	           --prefix='$$topdir' \
+	           --datadir='$$prefix/share' \
 	           --libsubdir='$$compiler/lib/$$pkgid' \
 	           --with-compiler=../../compiler/ghc-inplace$(dot_bat) \
 	           --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$(dot_bat) \