Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
build: trivial simplification
author
Felipe Contreras
<felipe.contreras@gmail.com>
Sat, 25 May 2013 02:41:01 +0000
(21:41 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 26 May 2013 21:26:59 +0000
(14:26 -0700)
SCRIPT_PYTHON_GEN is '$(patsubst %.py,%,$(SCRIPT_PYTHON))', so replace
'$(patsubst %.py,%,$(SCRIPT_PYTHON))' with it
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
edca415
)
diff --git
a/Makefile
b/Makefile
index 0f931a203002aec397f8b454f93df9aee97a21ad..64977f8b6ccae3e04409456a21f70ee329a2b48e 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1796,8
+1796,8
@@
$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
endif # NO_PERL
ifndef NO_PYTHON
endif # NO_PERL
ifndef NO_PYTHON
-$(
patsubst %.py,%,$(SCRIPT_PYTHON)
): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
-$(
patsubst %.py,%,$(SCRIPT_PYTHON)
): % : %.py
+$(
SCRIPT_PYTHON_GEN
): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
+$(
SCRIPT_PYTHON_GEN
): % : %.py
$(QUIET_GEN)$(RM) $@ $@+ && \
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
--no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
$(QUIET_GEN)$(RM) $@ $@+ && \
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
--no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
@@
-1809,7
+1809,7
@@
$(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
chmod +x $@+ && \
mv $@+ $@
else # NO_PYTHON
chmod +x $@+ && \
mv $@+ $@
else # NO_PYTHON
-$(
patsubst %.py,%,$(SCRIPT_PYTHON)
): % : unimplemented.sh
+$(
SCRIPT_PYTHON_GEN
): % : unimplemented.sh
$(QUIET_GEN)$(RM) $@ $@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@REASON@@|NO_PYTHON=$(NO_PYTHON)|g' \
$(QUIET_GEN)$(RM) $@ $@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@REASON@@|NO_PYTHON=$(NO_PYTHON)|g' \