diff options
| author | Olaf Hering <olaf@aepfle.de> | 2014-10-01 18:41:17 +0200 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2014-10-06 16:59:56 +0100 |
| commit | 2c96ecb1a4f002abf95be3333167d48b3be5868d (patch) | |
| tree | 59b408179f420072f509e36ce78dcfad6d813dd0 /config/Paths.mk.in | |
| parent | c66aa6c1452954fbf3e52c629b54a294309536b8 (diff) | |
| download | xen-2c96ecb1a4f002abf95be3333167d48b3be5868d.tar.gz | |
Use configure --libexecdir=BASEDIR to set LIBEXEC
The current usage of LIBEXEC is bogus. It describes the directory for
private xen executables. Other places create their own, similar
libexecdir path as $prefix/lib/xen/*.
Additional two other variables are used to describe similar paths:
PRIVATE_BINDIR and PRIVATE_PREFIX
The autoconf documentation refers to libexec as a directory for
executables and stuff which is called by other programs, not by the
user.
Adjust all places that want libexecdir as a target path. LIBEXEC refers
now to the base directory. Three convenience variables are used to refer
to paths to private binaries, libs and include files.
In the systemd files LIBEXEC_BIN is substituted, so this variable has to
be present in autoconf. All other variables are expanded in Paths.mk
because they are only used in Makefiles.
Most users of LIBEXEC are updated to use LIBEXEC_BIN because that is
what they want.
Users of PRIVATE_BINDIR are updated to use LIBEXEC_BIN because that is
what they want. PRIVATE_BINDIR and PRIVATE_PREFIX usage is removed by
this patch, in favour of LIBXEC_BIN and LIBEXEC
An internal libxl function was removed. A single helper to retrieve
LIBEXEC_BIN remains.
As suggested by the autoconf documentation, configure appends the
package name to LIBEXEC to make sure the provided directory really
refers to xen. This makes sure "make uninstall" preserves the real
libexecdir.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: George Dunlap <george.dunlap@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
[ ijc -- ran autogen.sh as requested, updated QEMU_TRADITIONAL_REVISION to
pickup version which uses LIBEXEC_BIN ]
Diffstat (limited to 'config/Paths.mk.in')
| -rw-r--r-- | config/Paths.mk.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 2151c14b2f..875578507c 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -31,7 +31,10 @@ sysconfdir := @sysconfdir@ SBINDIR := $(sbindir) BINDIR := $(bindir) -LIBEXEC := @LIBEXEC@ +LIBEXEC := $(libexecdir)/$(PACKAGE_TARNAME) +LIBEXEC_BIN := @LIBEXEC_BIN@ +LIBEXEC_LIB := $(LIBEXEC)/lib +LIBEXEC_INC := $(LIBEXEC)/include INCLUDEDIR := $(includedir) SHAREDIR := @SHAREDIR@ @@ -50,9 +53,6 @@ INITD_DIR := @INITD_DIR@ XEN_LOCK_DIR := @XEN_LOCK_DIR@ XEN_PAGING_DIR := @XEN_PAGING_DIR@ -PRIVATE_PREFIX := @PRIVATE_PREFIX@ -PRIVATE_BINDIR := @PRIVATE_BINDIR@ - XENFIRMWAREDIR := @XENFIRMWAREDIR@ XEN_CONFIG_DIR := @XEN_CONFIG_DIR@ |