[project @ 2001-06-29 15:10:14 by simonmar]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index dfa9a9b..89b7739 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -434,7 +434,7 @@ FPTOOLS_TOP_ABS_UNIX    = @hardtop@
 prefix                 = @prefix@
 exec_prefix            = @exec_prefix@
 bindir                 = @bindir@
-datadir                        = @datadir@/$(ProjectNameShort)-$(ProjectVersion)
+datadir                        = @datadir@
 
 #sysconfdir            = @datadir@
 #sharedstatedir                = @sharedstatedir@
@@ -447,6 +447,13 @@ mandir                     = @mandir@
 #UNUSED:infodir                = @infodir@
 #UNUSED:srcdir          = @srcdir@
 
+#
+# 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))
+
 # 
 # Default values for most of the above are only set if
 # they weren't configured to anything in particular