2010-03-19 09:38:33 +01:00
|
|
|
---
|
2010-09-27 16:02:12 +02:00
|
|
|
Makefile | 2 +-
|
2010-03-19 09:38:33 +01:00
|
|
|
git_remote_helpers/Makefile | 2 +-
|
2010-09-27 16:02:12 +02:00
|
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
2010-03-19 09:38:33 +01:00
|
|
|
|
|
|
|
|
--- a/git_remote_helpers/Makefile
|
|
|
|
|
+++ b/git_remote_helpers/Makefile
|
2010-09-27 16:02:12 +02:00
|
|
|
@@ -29,7 +29,7 @@
|
2010-03-19 09:38:33 +01:00
|
|
|
$(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
|
|
|
|
|
|
|
|
|
|
install: $(pysetupfile)
|
|
|
|
|
- $(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix)
|
|
|
|
|
+ $(PYTHON_PATH) $(pysetupfile) install --prefix $(prefix) --root $(DESTDIR_SQ)
|
|
|
|
|
|
|
|
|
|
instlibdir: $(pysetupfile)
|
|
|
|
|
@echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)"
|
2010-09-27 16:02:12 +02:00
|
|
|
--- a/Makefile
|
|
|
|
|
+++ b/Makefile
|
2010-10-11 14:44:17 +02:00
|
|
|
@@ -1718,7 +1718,7 @@
|
2010-09-27 16:02:12 +02:00
|
|
|
$(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
|
|
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
|
|
|
|
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
|
|
|
|
|
- --no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
|
|
|
|
|
+ --no-print-directory prefix='$(prefix_SQ)' DESTDIR=\
|
|
|
|
|
instlibdir` && \
|
|
|
|
|
sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
|
|
|
|
|
-e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \
|
