Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
build: cleanup using $<
author
Felipe Contreras
<felipe.contreras@gmail.com>
Sat, 25 May 2013 02:41:03 +0000
(21:41 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 26 May 2013 21:27:00 +0000
(14:27 -0700)
No need to list the first prerequisite. No functional changes.
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:
654f23f
)
diff --git
a/Makefile
b/Makefile
index f1512d336628dd1e9af431581d6dcd9b259990b5..cace26b87f872a440bb7cf21ccbe2820f0bae305 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1705,9
+1705,9
@@
version.sp version.s version.o: EXTRA_CPPFLAGS = \
$(BUILT_INS): git$X
$(QUIET_BUILT_IN)$(RM) $@ && \
$(BUILT_INS): git$X
$(QUIET_BUILT_IN)$(RM) $@ && \
- ln
git$X
$@ 2>/dev/null || \
- ln -s
git$X
$@ 2>/dev/null || \
- cp
git$X
$@
+ ln
$<
$@ 2>/dev/null || \
+ ln -s
$<
$@ 2>/dev/null || \
+ cp
$<
$@
common-cmds.h: ./generate-cmdlist.sh command-list.txt
common-cmds.h: ./generate-cmdlist.sh command-list.txt
@@
-1772,7
+1772,7
@@
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
-e ' x' \
-e '}' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-e ' x' \
-e '}' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
- $
@.perl
>$@+ && \
+ $
<
>$@+ && \
chmod +x $@+ && \
mv $@+ $@
chmod +x $@+ && \
mv $@+ $@
@@
-1805,7
+1805,7
@@
$(SCRIPT_PYTHON_GEN): % : %.py
sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
-e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
-e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
- $
@.py
>$@+ && \
+ $
<
>$@+ && \
chmod +x $@+ && \
mv $@+ $@
else # NO_PYTHON
chmod +x $@+ && \
mv $@+ $@
else # NO_PYTHON