From: Jon Nordby <jononor@gmail.com>
Date: Thu, 23 Feb 2012 08:57:26 +0000 (+0100)
Subject: fix-automake-1.13
X-Git-Tag: lxc-0.8.0-rc2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce6ce9d662b4ee8c0a10088867826a6725e06f70;p=thirdparty%2Flxc.git

fix-automake-1.13

## 0001-Replace-pkglib_PROGRAMS-with-pkglibexec_PROGRAMS.patch [diff]
From 95c566740bba899acc7792c11fcdb3f4d32dcfc9 Mon Sep 17 00:00:00 2001
From: Jon Nordby <jononor@gmail.com>
Date: Fri, 10 Feb 2012 11:38:35 +0100
Subject: [PATCH] Replace pkglib_PROGRAMS with pkglibexec_PROGRAMS

Without this change, autogen.sh fails with automake 1.11.3

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/configure.ac b/configure.ac
index f43dc07de..8383d3f3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)")
 
 AC_SUBST(LXCPATH, "${with_config_path}")
 AC_SUBST(LXCROOTFSMOUNT, "${with_rootfs_path}")
-AC_SUBST(LXCINITDIR, ['${libdir}/lxc'])
+AC_SUBST(LXCINITDIR, ['${libexecdir}/lxc'])
 AC_SUBST(LXCTEMPLATEDIR, ['${libdir}/lxc/templates'])
 
 AC_CHECK_HEADERS([linux/netlink.h linux/genetlink.h],
diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index e69588323..3a3816eda 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -97,7 +97,7 @@ bin_PROGRAMS = \
 	lxc-restart \
 	lxc-kill
 
-pkglib_PROGRAMS = \
+pkglibexec_PROGRAMS = \
 	lxc-init
 
 AM_LDFLAGS = -Wl,-E