X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=02e02bca4689f92b740eaef399624b5cfe88e82a;hb=cf2ee54939510b1a64ad99ca7d00aeb8a862c06b;hp=e0b9d3cec9ce33b2b13d2d1c274e5cfc3123f67c;hpb=62bad18960643f862bba8f14c31cce15b287fb81;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index e0b9d3c..02e02bc 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -291,6 +291,18 @@ else
 GhcEnableTablesNextToCode=YES
 endif
 
+# On Windows we normally want to make a relocatable bindist, to we
+# ignore flags like libdir
+ifeq "$(Windows)" "YES"
+RelocatableBuild = YES
+else
+RelocatableBuild = NO
+endif
+
+# When building bindists we set this to yes so that the binaries are as
+# portable as possible.
+BeConservative = NO
+
 #
 # Building various ways?
 # (right now, empty if not).
@@ -384,13 +396,7 @@ StripLibraries=NO
 
 # These are the URL patterns that Haddock uses to generate the "Source
 # File" links on each page.
-CorePackageSourceURL = http://darcs.haskell.org/ghc-6.6/packages/$(PACKAGE)/%{FILE}
-ExtraPackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE}
-
-# These are the packages required to be present in order to bootstrap GHC
-# NB. must be synced with libraries/core-packages
-CorePackages = base Cabal haskell98 readline regex-base regex-compat \
-	       regex-posix parsec stm template-haskell unix Win32
+PackageSourceURL = http://darcs.haskell.org/packages/$(PACKAGE)/%{FILE}
 
 # ----------------------------------------------------------------------------
 # Object-file splitting
@@ -555,11 +561,7 @@ libdir0         := @libdir@
 includedir      := @includedir@
 mandir          := @mandir@
 
-ifeq "$(Windows)" "YES"
-
-ifeq "$(strip $(prefix))" ""
-prefix		= /c/ghc
-endif
+ifeq "$(RelocatableBuild)" "YES"
 
 # Hack: our directory layouts tend to be different on Windows, so
 # hack around configure's bogus assumptions here.
@@ -567,20 +569,20 @@ datarootdir := $(prefix)
 datadir     := $(prefix)
 libdir      := $(prefix)
 
+docdir    := $(prefix)/doc
+htmldir   := $(docdir)
+dvidir    := $(docdir)
+pdfdir    := $(docdir)
+psdir     := $(docdir)
+
 else
 
-#
 # Unix: override libdir and datadir to put ghc-specific stuff in
 # a subdirectory with the version number included.
-#
 datarootdir := $(datadir0)
 datadir     := $(datadir0)/ghc-$(ProjectVersion)
 libdir      := $(libdir0)/ghc-$(ProjectVersion)
 
-endif # Windows
-
-headerdir := $(libdir)/include
-
 # New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags.
 # However, in order to support older autoconf's we don't use them.
 
@@ -596,44 +598,20 @@ dvidir    := $(docdir)
 pdfdir    := $(docdir)
 psdir     := $(docdir)
 
+endif # Windows
+
+headerdir := $(libdir)/include
+
 # Default place for putting interface files is $(libdir)
 # (overriden for packages in package.mk)
 ifacedir		= $(libdir)
 
-# 
-# Default values for most of the above are only set if
-# they weren't configured to anything in particular
-# via the configure script. (i.e., we make no assumption
-# that the autoconf-generated script will assign defaults
-# to all of the above).
-#
-ifeq "$(strip $(exec_prefix))" ""
-exec_prefix		= $(prefix)
-endif
-ifeq "$(strip $(bindir))" ""
-bindir			= $(exec_prefix)/bin
-endif
-
-#
 # NOTE: by intention, libexecdir and libdir point to 
 # the same place.
 #  => Only way to override this is to set libexecdir= on the command line.
 #     (NOTE: configure script setting is ignored).
 libexecdir		= $(libdir)
 
-ifeq "$(strip $(datadir))" ""
-datadir		= $(prefix)/share
-endif
-ifeq "$(strip $(libdir))" ""
-libdir		= $(exec_prefix)/lib
-endif
-ifeq "$(strip $(includedir))" ""
-includedir	= $(prefix)/include
-endif
-ifeq "$(strip $(mandir))" ""
-mandir		= $(prefix)/man
-endif
-
 # This is a bit of a lie, as this is a wrapper rather than the program
 # itself. However, it means that we don't have to worry about Windows
 # and non-Windows having different extensions.