Commit 488cfa00 authored by simonmar's avatar simonmar
Browse files

[project @ 2001-11-06 11:07:39 by simonmar]

Don't use a combination of '=' and ':=' to override libdir and
datadir, as it appears to not have the same behaviour in all versions
of GNU make.
parent 4b2cb594
......@@ -208,6 +208,9 @@ else
GhcWithNativeCodeGen=NO
endif
# Include support for generating Java
GhcWithJavaGen=NO
HaveLibDL = @HaveLibDL@
# Include GHCi in the compiler. Default to NO for the time being.
......@@ -451,15 +454,15 @@ FPTOOLS_TOP_ABS_UNIX = @hardtop@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
datadir = @datadir@
datadir0 = @datadir@
#sysconfdir = @datadir@
#sharedstatedir = @sharedstatedir@
#localstatedir = @localstatedir@
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
libdir = @libdir@
libdir0 = @libdir@
else
libdir = @prefix@
libdir0 = @prefix@
endif
includedir = @includedir@
oldincludedir = @oldincludedir@
......@@ -473,8 +476,11 @@ mandir = @mandir@
# a subdirectory with the version number included.
#
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
libdir := $(if $(ProjectNameShort),$(libdir)/$(ProjectNameShort)-$(ProjectVersion),$(libdir))
datadir := $(if $(ProjectNameShort),$(datadir)/$(ProjectNameShort)-$(ProjectVersion),$(datadir))
libdir = $(if $(ProjectNameShort),$(libdir0)/$(ProjectNameShort)-$(ProjectVersion),$(libdir0))
datadir = $(if $(ProjectNameShort),$(datadir0)/$(ProjectNameShort)-$(ProjectVersion),$(datadir0))
else
libdir = $(libdir0)
datadir = $(datadir0)
endif
#
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment