diff options
| author |   Jon Nordby <jononor@gmail.com> | 2012-02-23 09:57:26 +0100 |
|---|---|---|
| committer |   Daniel Lezcano <daniel.lezcano@free.fr> | 2012-02-23 09:57:26 +0100 |
| commit | ce6ce9d662b4ee8c0a10088867826a6725e06f70 (patch) | |
| tree | 77dc3a3d238c557a5f1b2c331fc1ef54a95d2938 | |
| parent | Add man page for lxc-attach (diff) | |
| download | lxc-ce6ce9d662b4ee8c0a10088867826a6725e06f70.tar.gz lxc-ce6ce9d662b4ee8c0a10088867826a6725e06f70.tar.bz2 lxc-ce6ce9d662b4ee8c0a10088867826a6725e06f70.zip | |
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>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/lxc/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f43dc07..8383d3f 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 e695883..3a3816e 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 |