summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e07d34a)
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.
#sysconfdir = @datadir@
#sharedstatedir = @sharedstatedir@
#localstatedir = @localstatedir@
#sysconfdir = @datadir@
#sharedstatedir = @sharedstatedir@
#localstatedir = @localstatedir@
-libdir = @libdir@/$(ProjectNameShort)-$(ProjectVersion)
includedir = @includedir@
oldincludedir = @oldincludedir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = @oldincludedir@
mandir = @mandir@
# override libdir and datadir to put project-specific stuff in
# a subdirectory with the version number included.
#
# 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
#
# Default values for most of the above are only set if