Commit 09a41d20 authored by simonmar's avatar simonmar

[project @ 2003-05-01 08:43:54 by simonmar]

Remove special cases for the setting of $(libdir) and $(datadir) on
mingw32, after discussion with Sigbjorn.
parent b4a006b8
......@@ -464,11 +464,7 @@ datadir0 = @datadir@
#sysconfdir = @datadir@
#sharedstatedir = @sharedstatedir@
#localstatedir = @localstatedir@
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
libdir0 = @libdir@
else
libdir0 = @prefix@
endif
includedir = @includedir@
oldincludedir = @oldincludedir@
mandir = @mandir@
......@@ -480,13 +476,8 @@ mandir = @mandir@
# override libdir and datadir to put project-specific stuff in
# a subdirectory with the version number included.
#
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
libdir = $(if $(ProjectNameShort),$(libdir0)/$(ProjectNameShort)-$(ProjectVersion),$(libdir0))
datadir = $(if $(ProjectNameShort),$(datadir0)/$(ProjectNameShort)-$(ProjectVersion),$(datadir0))
else
libdir = $(libdir0)
datadir = $(datadir0)
endif
# Default place for putting interface files is $(libdir)
# (overriden for packages in package.mk)
......
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