From bc1f60b3ba74032cb0895e154e02971aa380a6b3 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Thu, 23 Feb 2017 16:26:14 +0100 Subject: Default to pkginstall=true without duplicated definitions automake was complaining about duplicated definitions of pkginstall. It was defined to true in Makefile.python.am only to be overriden in some Makefile.am. Now we assume that pkginstall is implicit true and only skip installation when pkginstall is explicitly set to false. Signed-off-by: Christian Heimes Reviewed-By: Martin Basti --- Makefile.python.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.python.am b/Makefile.python.am index 4b9dc1d2b..f158ff5df 100644 --- a/Makefile.python.am +++ b/Makefile.python.am @@ -1,6 +1,5 @@ pkgname = $(shell basename "$(abs_srcdir)") pkgpythondir = $(pythondir)/$(pkgname) -pkginstall = true if VERBOSE_MAKE VERBOSITY="--verbose" @@ -20,7 +19,7 @@ all-local: $(top_builddir)/ipasetup.py --build-base "$(abs_builddir)/build" install-exec-local: $(top_builddir)/ipasetup.py - if [ "x$(pkginstall)" = "xtrue" ]; then \ + if [ "x$(pkginstall)" != "xfalse" ]; then \ $(PYTHON) $(srcdir)/setup.py \ $(VERBOSITY) \ build \ -- cgit