From: Ian Lynagh <igloo@earth.li>
Date: Thu, 6 Sep 2007 14:04:30 +0000 (+0000)
Subject: Wibble some variable definitions to fix installation of bindists
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=1f86a2618408913b267c767be5080175ce48d5de

Wibble some variable definitions to fix installation of bindists
---

diff --git a/libraries/Makefile b/libraries/Makefile
index 8d6f8e1..d2e2b06 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -88,6 +88,8 @@ space=$(empty) $(empty)
 
 # -----------------------------------------------------------------------------
 
+libraryhtmldir = $(htmldir)/libraries
+
 ifneq "$(DOING_BIN_DIST)" "YES"
 
 CONFIGURE_OPTS =
@@ -195,13 +197,10 @@ 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"
-datadir        = $$prefix
 libsubdir      = $$pkgid
 else
-datadir        = $$prefix/share/ghc
 libsubdir      = $$compiler/lib/$$pkgid
 endif
-libraryhtmldir = $(htmldir)/libraries
 
 # We rely on all the CONFIGURE_ARGS being quoted with '...', and there
 # being no 's inside the values.