As specified by FHS:
/usr/lib includes object files, libraries, and internal binaries that
are not intended to be executed directly by users or shell scripts.
Applications may use a single subdirectory under /usr/lib. If an
application uses a subdirectory, all architecture-dependent data
exclusively used by the application must be placed within that
subdirectory.
Signed-off-by: Daniel Lezcano <dlezc...@fr.ibm.com>
---
configure.ac | 7 ++++---
src/lxc/Makefile.am | 2 +-
src/lxc/lxc-setcap.in | 4 ++--
src/lxc/lxc_execute.c | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8f3f633..5370270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,6 @@ AS_AC_EXPAND(PREFIX, $prefix)
AS_AC_EXPAND(LIBDIR, $libdir)
AS_AC_EXPAND(BINDIR, $bindir)
AS_AC_EXPAND(INCLUDEDIR, $includedir)
-AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
AS_AC_EXPAND(DATADIR, $datadir)
AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
@@ -54,13 +53,15 @@ AC_ARG_WITH([rootfs-path],
)], [], [with_rootfs_path="${libdir}/lxc/rootfs"])
AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)")
+
AS_AC_EXPAND(LXCPATH, "${with_config_path}")
AS_AC_EXPAND(LXCROOTFSMOUNT, "${with_rootfs_path}")
+AS_AC_EXPAND(LXCINITDIR, $libdir/lxc)
AH_TEMPLATE([LXCPATH], [lxc configuration repository])
-AH_TEMPLATE([LXCLIBEXECDIR], [lxc executable library path])
+AH_TEMPLATE([LXCINITDIR], [lxc-init directory location])
AH_TEMPLATE([LXCROOTFSMOUNT], [lxc default rootfs mount point])
AC_DEFINE_UNQUOTED(LXCPATH, "$LXCPATH")
-AC_DEFINE_UNQUOTED(LXCLIBEXECDIR, "$LIBEXECDIR")
+AC_DEFINE_UNQUOTED(LXCINITDIR, "$LXCINITDIR")
AC_DEFINE_UNQUOTED(LXCROOTFSMOUNT, "$LXCROOTFSMOUNT")
AC_CHECK_HEADERS([linux/netlink.h linux/genetlink.h],
diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 41cbb01..3cbd6c0 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -86,7 +86,7 @@ bin_PROGRAMS = \
lxc-restart \
lxc-kill
-libexec_PROGRAMS = \
+pkglib_PROGRAMS = \
lxc-init
AM_LDFLAGS=-Wl,-E -Wl,-rpath -Wl,$(libdir)
diff --git a/src/lxc/lxc-setcap.in b/src/lxc/lxc-setcap.in
index a60cd95..23829ee 100644
--- a/src/lxc/lxc-setcap.in
+++ b/src/lxc/lxc-setcap.in
@@ -52,7 +52,7 @@ lxc_setcaps()
setcap $LXC_UNSHARE_CAPS=ep @BINDIR@/lxc-unshare
setcap $LXC_NETSTAT_CAPS=ep @BINDIR@/lxc-netstat
setcap $LXC_CHECKPOINT_CAPS=ep @BINDIR@/lxc-checkpoint
- setcap $LXC_INIT_CAPS=ep @LIBEXECDIR@/lxc-init
+ setcap $LXC_INIT_CAPS=ep @LXCINITDIR@/lxc-init
test -e @LXCPATH@ || mkdir -p @LXCPATH@
chmod 0777 @LXCPATH@
@@ -67,7 +67,7 @@ lxc_dropcaps()
setcap -r @BINDIR@/lxc-unshare
setcap -r @BINDIR@/lxc-netstat
setcap -r @BINDIR@/lxc-checkpoint
- setcap -r @LIBEXECDIR@/lxc-init
+ setcap -r @LXCINITDIR@/lxc-init
chmod 0755 @LXCPATH@
}
diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index 669d383..c3a0cd7 100644
--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
my_args.progname, my_args.quiet))
return -1;
- args = lxc_arguments_dup(LXCLIBEXECDIR "/lxc-init", &my_args);
+ args = lxc_arguments_dup(LXCINITDIR "/lxc-init", &my_args);
if (!args)
return -1;
--
1.7.0.4
------------------------------------------------------------------------------
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
