Install lxc-init in libexec dir

Since lxc-init is a helper program, which doesn't have an usage output and is only going to be called only internally by lxc-execute, we'll move it to the libexec dir. Signed-off-by: Guido Trotter <ultrotter@quaqua.net> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

Install lxc-init in libexec dir
a25ba7aa · Guido Trotter · Daniel Lezcano · d0dfcfbd · a25ba7aa · a25ba7aa
Commit a25ba7aa authored Mar 18, 2009 by Guido Trotter Committed by Daniel Lezcano Mar 19, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

configure.in configure.in +1 -0

Makefile.am src/lxc/Makefile.am +6 -2

lxc_execute.c src/lxc/lxc_execute.c +1 -1

No files found.
--- a/configure.in
+++ b/configure.in
@@ -16,6 +16,7 @@ AC_CHECK_PROG(SETCAP, setcap, yes, no)
 AC_CHECK_PROG(DOCBOOK, docbook2man, yes, no)
 AM_CONDITIONAL(ENABLE_DOCBOOK, test x$DOCBOOK = xyes)
 AS_AC_EXPAND(BINDIR, $bindir)
+AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)

--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
-INCLUDES= -I$(top_srcdir)/src -DLXCPATH="\"$(localstatedir)/lxc\"" -DLXCBINDIR="\"$(bindir)\""
+INCLUDES= -I$(top_srcdir)/src -DLXCPATH="\"$(localstatedir)/lxc\"" \
+	  -DLXCBINDIR="\"$(bindir)\"" \
+	  -DLXCLIBEXECDIR="\"$(libexecdir)\""
 AM_LDFLAGS= -lutil
 lib_LTLIBRARIES = liblxc.la
 pkginclude_HEADERS = \
@@ -56,7 +58,6 @@ bin_SCRIPTS = \
 bin_PROGRAMS = \
 	lxc-unshare \
-	lxc-init \
 	lxc-create \
 	lxc-destroy \
 	lxc-stop \
@@ -73,6 +74,9 @@ bin_PROGRAMS = \
 	lxc-restart \
 	lxc-version
+libexec_PROGRAMS = \
+	lxc-init
 lxc_unshare_SOURCES = lxc_unshare.c
 lxc_unshare_LDADD = liblxc.la

--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
 	}
 	nbargs = 0;
-	args[nbargs++] = LXCBINDIR "/lxc-init";
+	args[nbargs++] = LXCLIBEXECDIR "/lxc-init";
 	args[nbargs++] = "--mount-procfs";
 	args[nbargs++] = "--";