From ec155f69d231ac54f108d417be060b21414ff21d Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 13 Sep 2007 15:53:31 +0000 Subject: [PATCH] Define RelocatableBuild variable default YES on Windows, NO otherwise. --- libraries/Makefile | 2 +- mk/config.mk.in | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libraries/Makefile b/libraries/Makefile index 4068cf2..ac2bde4 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -92,7 +92,7 @@ space=$(empty) $(empty) # ----------------------------------------------------------------------------- docdir := $(docdir)/libraries/$$pkgid -ifeq "$(Windows)" "YES" +ifeq "$(RelocatableBuild)" "YES" # On Windows we want to make moveable bindists, but we need to tell # ghc-pkg where the haddock docs are. Therefore we completely ignore # where the user tells us to put the haddock documentation and put it diff --git a/mk/config.mk.in b/mk/config.mk.in index 9bfd642..ea2f5d6 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -291,6 +291,14 @@ 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 -- 1.7.10.4