diff options
| author | Christian Heimes <cheimes@redhat.com> | 2017-02-23 14:12:22 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-03-02 14:43:37 +0100 |
| commit | ab9f42d6eeefeaca2e4a5a9acfbb07b428be4616 (patch) | |
| tree | 2024a40918c6e20f3d9adf4a35f16cd0c9a39425 | |
| parent | b4c1bf1c7d1a63e802abe6334bd1112d2d468513 (diff) | |
| download | freeipa-ab9f42d6eeefeaca2e4a5a9acfbb07b428be4616.tar.gz freeipa-ab9f42d6eeefeaca2e4a5a9acfbb07b428be4616.tar.xz freeipa-ab9f42d6eeefeaca2e4a5a9acfbb07b428be4616.zip | |
Python build: use --build-base everywhere
Some calls to setup.py specified a build base, some did not. This can
lead to issues, e.g. build, clean and install are using different build
directories.
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | Makefile.python.am | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/Makefile.python.am b/Makefile.python.am index e4efc1749..4b9dc1d2b 100644 --- a/Makefile.python.am +++ b/Makefile.python.am @@ -17,17 +17,19 @@ all-local: $(top_builddir)/ipasetup.py cd $(srcdir); $(PYTHON) setup.py \ $(VERBOSITY) \ build \ - --build-base "$(abs_builddir)/build" + --build-base "$(abs_builddir)/build" install-exec-local: $(top_builddir)/ipasetup.py if [ "x$(pkginstall)" = "xtrue" ]; then \ $(PYTHON) $(srcdir)/setup.py \ $(VERBOSITY) \ + build \ + --build-base "$(abs_builddir)/build" \ install \ - --prefix "$(DESTDIR)$(prefix)" \ - --single-version-externally-managed \ - --record "$(DESTDIR)$(pkgpythondir)/install_files.txt" \ - --optimize 1; \ + --prefix "$(DESTDIR)$(prefix)" \ + --single-version-externally-managed \ + --record "$(DESTDIR)$(pkgpythondir)/install_files.txt" \ + --optimize 1; \ fi uninstall-local: @@ -37,7 +39,10 @@ uninstall-local: rm -rf "$(DESTDIR)$(pkgpythondir)" clean-local: $(top_builddir)/ipasetup.py - $(PYTHON) "$(srcdir)/setup.py" clean --all + $(PYTHON) "$(srcdir)/setup.py" \ + clean \ + --all + --build-base "$(abs_builddir)/build" rm -rf "$(srcdir)/build" "$(srcdir)/dist" "$(srcdir)/MANIFEST" find "$(srcdir)" \ -name "*.py[co]" -delete -o \ @@ -59,4 +64,8 @@ WHEELDISTDIR = $(top_builddir)/dist/wheels .PHONY: bdist_wheel bdist_wheel: $(top_builddir)/ipasetup.py rm -rf $(WHEELDISTDIR)/$(pkgname)-*.whl - $(PYTHON) "$(srcdir)/setup.py" bdist_wheel --dist-dir=$(WHEELDISTDIR) + $(PYTHON) "$(srcdir)/setup.py" \ + build \ + --build-base "$(abs_builddir)/build" \ + bdist_wheel \ + --dist-dir=$(WHEELDISTDIR) |