From 09a41d202bc87ed4bcde1ff3e99b8202986a3b74 Mon Sep 17 00:00:00 2001 From: simonmar Date: Thu, 1 May 2003 08:43:54 +0000 Subject: [PATCH] [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. --- mk/config.mk.in | 9 --------- 1 file changed, 9 deletions(-) diff --git a/mk/config.mk.in b/mk/config.mk.in index 23e6825..5d339ad 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -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) -- 1.7.10.4