From: Guido Trotter <ultrotter@google.com>
Date: Wed, 18 Mar 2009 17:27:27 +0000 (+0000)
Subject: Install lxc-init in libexec dir
X-Git-Tag: lxc_0_6_1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a25ba7aadb071ed9198ce42b15b27186c4bfbff6;p=thirdparty%2Flxc.git

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>
---

diff --git a/configure.in b/configure.in
index 7bc788257..fa94008b6 100644
--- 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)
 
diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 9254bffdc..3f0c1d75a 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -1,4 +1,6 @@
-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
 
diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index 362c03e55..66f66fde1 100644
--- 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++] = "--";