From 1abb3c63204c465f90326b945a9b173021198911 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 2 Jun 2007 19:38:26 +0000 Subject: [PATCH] Hack libsubdir so that it does the right thing on both Windows and non-Windows --- libraries/Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libraries/Makefile b/libraries/Makefile index ba6d547..04404d2 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -175,6 +175,16 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # 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 @@ -183,7 +193,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup $(CONFIGURE_OPTS) \ --prefix='$$topdir' \ --datadir='$$prefix/share' \ - --libsubdir='$$compiler/lib/$$pkgid' \ + --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) \ -- 1.7.10.4