diff options
| author | Matt Wilson <msw@amazon.com> | 2012-07-05 11:00:28 +0100 |
|---|---|---|
| committer | Matt Wilson <msw@amazon.com> | 2012-07-05 11:00:28 +0100 |
| commit | f9cc7456425b542feb4a2e6f4bd5a7db44f5eaf0 (patch) | |
| tree | 6aa225f4c238b30bbf2f27878116f0b492a6cf69 /config/StdGNU.mk | |
| parent | ed367d4f9de58269f8be356268d382060f9f7e42 (diff) | |
| download | xen-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/StdGNU.mk')
| -rw-r--r-- | config/StdGNU.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/config/StdGNU.mk b/config/StdGNU.mk index e2f2e1ef36..b6adbbe422 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -32,19 +32,13 @@ INSTALL_PROG = $(INSTALL) -m0755 -p PREFIX ?= /usr BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include -LIBLEAFDIR = lib -LIBLEAFDIR_x86_32 = lib -LIBLEAFDIR_x86_64 ?= lib64 -LIBDIR = $(PREFIX)/$(LIBLEAFDIR) -LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32) -LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64) -LIBEXEC = $(LIBDIR_x86_32)/xen/bin +LIBEXEC = $(PREFIX)/lib/xen/bin SHAREDIR = $(PREFIX)/share MANDIR = $(SHAREDIR)/man MAN1DIR = $(MANDIR)/man1 MAN8DIR = $(MANDIR)/man8 SBINDIR = $(PREFIX)/sbin -XENFIRMWAREDIR = $(LIBDIR_x86_32)/xen/boot +XENFIRMWAREDIR = $(PREFIX)/lib/xen/boot PRIVATE_PREFIX = $(LIBDIR)/xen PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin |