Commit a25ba7aa by Guido Trotter Committed by Daniel Lezcano

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: 's avatarGuido Trotter <ultrotter@quaqua.net> Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent d0dfcfbd
......@@ -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)
......
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
......
......@@ -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++] = "--";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment