aboutsummaryrefslogtreecommitdiffstats
path: root/Config.mk
diff options
context:
space:
mode:
authorMatt Wilson <msw@amazon.com>2012-07-05 11:00:28 +0100
committerMatt Wilson <msw@amazon.com>2012-07-05 11:00:28 +0100
commitf9cc7456425b542feb4a2e6f4bd5a7db44f5eaf0 (patch)
tree6aa225f4c238b30bbf2f27878116f0b492a6cf69 /Config.mk
parented367d4f9de58269f8be356268d382060f9f7e42 (diff)
downloadxen-f9cc7456425b542feb4a2e6f4bd5a7db44f5eaf0.tar.gz
xen-f9cc7456425b542feb4a2e6f4bd5a7db44f5eaf0.tar.bz2
xen-f9cc7456425b542feb4a2e6f4bd5a7db44f5eaf0.zip
tools: honour --libdir when it is passed to ./configure
Currently shared libraries are automatically installed into /usr/lib or /usr/lib64, depending on the supplied --prefix value and $(XEN_TARGET_ARCH). Some systems, like recent Debian and Ubuntu releases, do not use /usr/lib64, but instead /usr/lib/x86_64-linux-gnu. With this change, packagers can supply the desired location for shared libraries on the ./configure command line. Packagers need to note that the default behaviour on 64-bit Linux systems will be to install shared libraries in /usr/lib, not /usr/lib64, unless a --libdir value is provided to ./configure. Additionally, the libfsimage plugins are now loaded explicitly from $LIBDIR/fs, removing platform-based decision trees in code. Signed-off-by: Matt Wilson <msw@amazon.com> Acked-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> [ ijc -- resolve rejects in configure by rerunning autogen.sh. Dropped changes to remove m4/default_lib.m4 and update m4/pkg.m4 since they cause LIBDIR=/lib instead of /usr/lib. Reran ./autogen.sh after that too ] Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'Config.mk')
-rw-r--r--Config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Config.mk b/Config.mk
index 19e14dfc71..52149749ff 100644
--- a/Config.mk
+++ b/Config.mk
@@ -67,7 +67,7 @@ $(eval $(call setvar_dir,INITD_DIR,/etc,/rc.d/init.d,/rc.d/init.d,/init.d))
ifneq ($(EXTRA_PREFIX),)
EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
-EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBLEAFDIR)
+EXTRA_LIB += $(EXTRA_PREFIX)/lib
endif
PYTHON ?= python