diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-08-06 08:45:12 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-07 14:52:30 +0000 |
| commit | 7d43e7c451d79c0e110bdb60a398ad083720c48b (patch) | |
| tree | db3f76d5580a3fdd666e0ba187c7c76db91cf5ea | |
| parent | 0f1086cf7c2f8d5dbff2e31dfa4f4f8d3864281f (diff) | |
| download | podman-7d43e7c451d79c0e110bdb60a398ad083720c48b.tar.gz podman-7d43e7c451d79c0e110bdb60a398ad083720c48b.tar.bz2 podman-7d43e7c451d79c0e110bdb60a398ad083720c48b.zip | |
Pass DESTDIR down to python Makefile
In order to get a cleaner build out of the rpms we should
pass down the DESTDIR to the python Makefiles. Then we
can use them instead of hard coding other inteligence into
the spec files.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1214
Approved by: baude
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | contrib/python/podman/Makefile | 3 | ||||
| -rw-r--r-- | contrib/python/pypodman/Makefile | 3 |
3 files changed, 7 insertions, 4 deletions
@@ -1,4 +1,5 @@ GO ?= go +DESTDIR ?= / EPOCH_TEST_COMMIT ?= 7462ebe830b256e9e145d133c824de5dfd23045d HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ @@ -240,8 +241,8 @@ install.systemd: install ${SELINUXOPT} -m 644 -D contrib/varlink/podman.conf ${TMPFILESDIR}/podman.conf install.python: - $(MAKE) -C contrib/python/podman install - $(MAKE) -C contrib/python/pypodman install + $(MAKE) DESTDIR=${DESTDIR} -C contrib/python/podman install + $(MAKE) DESTDIR=${DESTDIR} -C contrib/python/pypodman install uninstall: for i in $(filter %.1,$(MANPAGES)); do \ diff --git a/contrib/python/podman/Makefile b/contrib/python/podman/Makefile index 0a0804566..7096f6152 100644 --- a/contrib/python/podman/Makefile +++ b/contrib/python/podman/Makefile @@ -1,4 +1,5 @@ PYTHON ?= /usr/bin/python3 +DESTDIR ?= / .PHONY: python-podman python-podman: @@ -14,7 +15,7 @@ integration: .PHONY: install install: - $(PYTHON) setup.py install + $(PYTHON) setup.py install --root ${DESTDIR} .PHONY: clobber clobber: uninstall clean diff --git a/contrib/python/pypodman/Makefile b/contrib/python/pypodman/Makefile index 6bc5b968b..fb25776fa 100644 --- a/contrib/python/pypodman/Makefile +++ b/contrib/python/pypodman/Makefile @@ -1,4 +1,5 @@ PYTHON ?= /usr/bin/python3 +DESTDIR := / .PHONY: python-pypodman python-pypodman: @@ -14,7 +15,7 @@ integration: .PHONY: install install: - $(PYTHON) setup.py install + $(PYTHON) setup.py install --root ${DESTDIR} .PHONY: clobber clobber: uninstall clean |