[PATCH v2 1/2] git_remote_cvs: Honor DESTDIR in the Makefile
From: David Aguilar <hidden>
Date: 2016-06-15 22:47:15
Subsystem:
the rest · Maintainer:
Linus Torvalds
This modifies the setup.py invocation so that user-defined DESTDIRs are taken into account. Signed-off-by: David Aguilar <redacted> --- setup.py gets confused if we use --root like in v1 of this patch. I think this is simpler. Thoughts? git_remote_cvs/Makefile | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/git_remote_cvs/Makefile b/git_remote_cvs/Makefile
index 8dbf3fa..2e26dbe 100644
--- a/git_remote_cvs/Makefile
+++ b/git_remote_cvs/Makefile@@ -3,6 +3,9 @@ # pysetupfile:=setup.py +# Shell quote (do not use $(call) to accommodate ancient setups); +DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) + ifndef PYTHON_PATH PYTHON_PATH = /usr/bin/python endif
@@ -19,7 +22,8 @@ PYLIBDIR=`$(PYTHON_PATH) -c "import sys; print 'lib/python%i.%i/site-packages' % all: $(pysetupfile) $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build install: $(pysetupfile) - $(PYTHON_PATH) $(pysetupfile) install --prefix $(prefix) + $(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix) + instlibdir: $(pysetupfile) @echo "$(prefix)/$(PYLIBDIR)" clean:
--
1.6.4.314.g034e1