... to mirror the tools/python side in c/s 2b8314a3c354. No functional change.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com> --- CC: Wei Liu <w...@xen.org> CC: Anthony PERARD <anthony.per...@citrix.com> CC: Marek Marczykowski-Górecki <marma...@invisiblethingslab.com> CC: Bernhard Kaindl <bernhard.kai...@citrix.com> --- tools/pygrub/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile index 37b214621492..29ad0513212f 100644 --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile @@ -6,19 +6,20 @@ PY_CFLAGS = $(CFLAGS) $(PY_NOOPT_CFLAGS) PY_LDFLAGS = $(SHLIB_LDFLAGS) $(APPEND_LDFLAGS) INSTALL_LOG = build/installed_files.txt +setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" \ + $(PYTHON) setup.py + .PHONY: all all: build .PHONY: build build: - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build + $(setup.py) build .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)/$(bindir) - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \ - LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \ - --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ - --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force + $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ + --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \ "`readlink -f $(DESTDIR)/$(bindir)`" != \ "`readlink -f $(LIBEXEC_BIN)`" ]; then \ -- 2.30.2