[PATCH 16/19] Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
From: Sverre Rabbelier <hidden>
Date: 2016-06-15 22:47:38
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
From: Johan Herland <redacted> Junio discovered that the installed git-remote-cvs executable is unable to find the installed git_remote_cvs Python package. This is due to the 'instlibdir' target of git_remote_cvs/Makefile being invoked with insufficient arguments (prefix and DESTDIR). This patch fixes that. Signed-off-by: Johan Herland <redacted> --- Unchanged. Makefile | 2 +- git_remote_cvs/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index a63f44d..9fb2747 100644
--- a/Makefile
+++ b/Makefile@@ -1525,7 +1525,7 @@ endif # NO_PERL ifndef NO_PYTHON $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py $(QUIET_GEN)$(RM) $@ $@+ && \ - INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_cvs -s --no-print-directory instlibdir` && \ + INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_cvs -s --no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' instlibdir` && \ sed -e '1{' \ -e ' s|#!.*python|#!$(PYTHON_PATH_SQ)|' \ -e '}' \
diff --git a/git_remote_cvs/Makefile b/git_remote_cvs/Makefile
index 061c247..0d9eb31 100644
--- a/git_remote_cvs/Makefile
+++ b/git_remote_cvs/Makefile@@ -28,7 +28,7 @@ install: $(pysetupfile) $(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix) instlibdir: $(pysetupfile) - @echo "$(prefix)/$(PYLIBDIR)" + @echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)" clean: $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) clean -a
--
1.6.5.2.291.gf76a3