From b8fe7ca6f6559845c6f96657f52c7d24cd792317 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sun, 19 Feb 2012 20:58:42 +0100
Subject: [PATCH] Fix Makefile.am compatibility with automake 1.11.2
Automake 1.11.2 made the following change:
* Long-standing bugs:
- Automake now warns about more primary/directory invalid combinations,
such as "doc_LIBRARIES" or "pkglib_PROGRAMS".
Unfortunately, this breaks our Makefile.am (issue 216) exactly because
we were relying on pkglib_SCRIPTS.
This patch works around this by adding a new myexeclibdir variable
(exec so that it is intalled at `install-exec` time, the same as the
pkglibdir), and switches to that.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
Makefile.am | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d35c1559e..bb7405cc5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,7 @@ toolsdir = $(pkglibdir)/tools
iallocatorsdir = $(pkglibdir)/iallocators
pytoolsdir = $(pkgpythondir)/tools
docdir = $(datadir)/doc/$(PACKAGE)
+myexeclibdir = $(pkglibdir)
# Delete output file if an error occurred while building it
.DELETE_ON_ERROR:
@@ -526,12 +527,12 @@ pkglib_python_scripts = \
nodist_pkglib_python_scripts = \
tools/ensure-dirs
-pkglib_SCRIPTS = \
+myexeclib_SCRIPTS = \
daemons/daemon-util \
tools/kvm-ifup \
$(pkglib_python_scripts)
-nodist_pkglib_SCRIPTS = \
+nodist_myexeclib_SCRIPTS = \
$(nodist_pkglib_python_scripts)
EXTRA_DIST = \
--
GitLab