Andrew's git / gitweb.git / diff
?
Makefile: POSIX windres
authorSteven Penny <svnpenn@gmail.com>
Sat, 7 Jan 2017 21:41:10 +0000 (15:41 -0600)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jan 2017 09:56:22 +0000 (01:56 -0800)
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>
Makefile patch | blob | history
diff --git a/Makefile b/Makefile
index d861bd9985dd41c24d5ff08a985c9d280d9dc07c..a2a12125048ccd8da3ff8c20fa08bbec865560e8 100644 (file)
--- 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