forked from pool/git
Accepting request 49174 from devel:tools:scm
Copy from devel:tools:scm/git based on submit request 49174 from user coolo OBS-URL: https://build.opensuse.org/request/show/49174 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=45
This commit is contained in:
committed by
Git OBS Bridge
parent
3dfd548265
commit
bb54ee6dfc
@@ -1,10 +1,11 @@
|
||||
---
|
||||
Makefile | 2 +-
|
||||
git_remote_helpers/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/git_remote_helpers/Makefile
|
||||
+++ b/git_remote_helpers/Makefile
|
||||
@@ -25,7 +25,7 @@
|
||||
@@ -29,7 +29,7 @@
|
||||
$(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
|
||||
|
||||
install: $(pysetupfile)
|
||||
@@ -13,3 +14,14 @@
|
||||
|
||||
instlibdir: $(pysetupfile)
|
||||
@echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)"
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1700,7 +1700,7 @@
|
||||
$(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@@")|' \
|
||||
|
||||
Reference in New Issue
Block a user