diff options
| author | Christian Heimes <cheimes@redhat.com> | 2017-02-23 16:26:14 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-03-02 14:43:37 +0100 |
| commit | bc1f60b3ba74032cb0895e154e02971aa380a6b3 (patch) | |
| tree | 946d7ad4cc211460cdbdf0d4e18134902f5fa3c1 | |
| parent | 60cfacc54167b7b94b63874ade62740d980e3746 (diff) | |
| download | freeipa-bc1f60b3ba74032cb0895e154e02971aa380a6b3.tar.gz freeipa-bc1f60b3ba74032cb0895e154e02971aa380a6b3.tar.xz freeipa-bc1f60b3ba74032cb0895e154e02971aa380a6b3.zip | |
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 <cheimes@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | Makefile.python.am | 3 |
1 files changed, 1 insertions, 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 \ |