2013-08-27 20:44:30 +02:00
|
|
|
Index: git-1.8.4/Makefile
|
|
|
|
|
===================================================================
|
|
|
|
|
--- git-1.8.4/Makefile.orig 2013-08-24 03:38:43.000000000 +0800
|
|
|
|
|
+++ git-1.8.4/Makefile 2013-08-26 09:46:14.596687535 +0800
|
|
|
|
|
@@ -1838,7 +1838,7 @@ $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PRE
|
|
|
|
|
$(SCRIPT_PYTHON_GEN): % : %.py
|
2010-09-27 16:02:12 +02:00
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
|
|
|
|
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
|
|
|
|
|
- --no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
|
2013-08-27 20:44:30 +02:00
|
|
|
+ --no-print-directory prefix='$(prefix_SQ)' DESTDIR= \
|
2010-09-27 16:02:12 +02:00
|
|
|
instlibdir` && \
|
|
|
|
|
sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
|
|
|
|
|
-e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \
|
2013-08-27 20:44:30 +02:00
|
|
|
Index: git-1.8.4/git_remote_helpers/Makefile
|
|
|
|
|
===================================================================
|
|
|
|
|
--- git-1.8.4/git_remote_helpers/Makefile.orig 2013-08-24 03:38:43.000000000 +0800
|
|
|
|
|
+++ git-1.8.4/git_remote_helpers/Makefile 2013-08-26 09:47:37.941682649 +0800
|
2013-03-14 15:20:23 +01:00
|
|
|
@@ -35,7 +35,7 @@ all: $(pysetupfile)
|
|
|
|
|
$(QUIET)echo "$(py_version)" >GIT-PYTHON-VERSION
|
|
|
|
|
|
|
|
|
|
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)"
|
