From: qrczak <unknown>
Date: Sat, 30 Jun 2001 22:57:20 +0000 (+0000)
Subject: [project @ 2001-06-30 22:57:20 by qrczak]
X-Git-Tag: Approximately_9120_patches~1635
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=70828f20a819092743039eecb75694db2e3cb0a3;hp=e07d34ab17df2b667cb2ce895be27f740f4f273e;p=ghc-hetmet.git

[project @ 2001-06-30 22:57:20 by qrczak]
Don't add leading space to libdir (was harmful for drivers).

Don't add $(ProjectNameShort)-$(ProjectVersion) to libdir if
$(ProjectNameShort) is empty; I hope it's correct.
---

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 89b7739..ad80fee 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -439,7 +439,7 @@ datadir			= @datadir@
 #sysconfdir		= @datadir@
 #sharedstatedir		= @sharedstatedir@
 #localstatedir		= @localstatedir@
-libdir			= @libdir@/$(ProjectNameShort)-$(ProjectVersion)
+libdir			= @libdir@
 includedir		= @includedir@
 oldincludedir		= @oldincludedir@
 mandir			= @mandir@
@@ -451,8 +451,8 @@ mandir			= @mandir@
 # override libdir and datadir to put project-specific stuff in
 # a subdirectory with the version number included.
 #
-libdir     := $(if $(ProjectNameShort), $(libdir), $(libdir))
-datadir    := $(if $(ProjectNameShort), $(datadir)/$(ProjectNameShort)-$(ProjectVersion), $(datadir))
+libdir     := $(if $(ProjectNameShort),$(libdir)/$(ProjectNameShort)-$(ProjectVersion),$(libdir))
+datadir    := $(if $(ProjectNameShort),$(datadir)/$(ProjectNameShort)-$(ProjectVersion),$(datadir))
 
 # 
 # Default values for most of the above are only set if