summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Steven Penny <svnpenn@gmail.com>2017-01-07 15:41:10 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-09 01:56:22 -0800
commit7c44b33f8b67cc6737caa0b812dbd963ca8bbb00 (patch)
tree55a662f6ac76d8f91202efa82c7cd494e0e2fde6
parentFourth batch for 2.12 (diff)
downloadtgif-7c44b33f8b67cc6737caa0b812dbd963ca8bbb00.tar.xz
Makefile: POSIX windres
When environment variable POSIXLY_CORRECT is set, the "input -o output" syntax is not supported. http://cygwin.com/ml/cygwin/2017-01/msg00036.html Use "-i input -o output" syntax instead. Signed-off-by: Steven Penny <svnpenn@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d861bd9985..a2a1212504 100644
--- a/Makefile
+++ b/Makefile
@@ -1816,7 +1816,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
git.res: git.rc GIT-VERSION-FILE
$(QUIET_RC)$(RC) \
$(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
- -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
+ -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
# This makes sure we depend on the NO_PERL setting itself.
$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS