From 16d08ae7e3897391ca8e2500deaebcf021d5499a Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 5 Nov 2015 15:02:11 +0100 Subject: [PATCH] hooks: put binary hooks into $libexecdir/lxc/hooks MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Wolfgang Bumiller Acked-by: Stéphane Graber --- configure.ac | 1 + hooks/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 874b44638..c5e6d288f 100644 --- a/configure.ac +++ b/configure.ac @@ -539,6 +539,7 @@ AS_AC_EXPAND(LXCROOTFSMOUNT, "$with_rootfs_path") AS_AC_EXPAND(LXCTEMPLATEDIR, "$datadir/lxc/templates") AS_AC_EXPAND(LXCTEMPLATECONFIG, "$datadir/lxc/config") AS_AC_EXPAND(LXCHOOKDIR, "$datadir/lxc/hooks") +AS_AC_EXPAND(LXCBINHOOKDIR, "$libexecdir/lxc/hooks") AS_AC_EXPAND(LXCINITDIR, "$libexecdir") AS_AC_EXPAND(LOGPATH, "$with_log_path") AS_AC_EXPAND(RUNTIME_PATH, "$with_runtime_path") diff --git a/hooks/Makefile.am b/hooks/Makefile.am index 499a2c4cf..23b85c8f3 100644 --- a/hooks/Makefile.am +++ b/hooks/Makefile.am @@ -1,4 +1,5 @@ hooksdir=@LXCHOOKDIR@ +binhooksdir=@LXCBINHOOKDIR@ hooks_SCRIPTS = \ clonehostname \ @@ -6,7 +7,7 @@ hooks_SCRIPTS = \ ubuntu-cloud-prep \ squid-deb-proxy-client -hooks_PROGRAMS = \ +binhooks_PROGRAMS = \ unmount-namespace unmount_namespace_SOURCES = \ -- 2.47.2