From d801a0eb8efe3ccf57bb5203cec47b1c98ed23fc Mon Sep 17 00:00:00 2001 From: Daniel Dragan Date: Sun, 8 Dec 2013 19:38:49 -0500 Subject: [PATCH] cleanup ..\git_version.h rule in win32/Makefile Group the nmake line onto 1 line similar to the dmake version, for 1 shell call out vs 3. "&&" makes sure the build stops if miniperl returns non-0 instead of ignoring the code, cd'ing back to dir win32, and continuing the build. Part of RT #120727. --- win32/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/win32/Makefile b/win32/Makefile index cfd8ed3..4fe42d6 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -951,9 +951,7 @@ config.w32 : $(CFGSH_TMPL) @echo #endif>>$@ ..\git_version.h : $(MINIPERL) ..\make_patchnum.pl - cd .. - miniperl -Ilib make_patchnum.pl - cd win32 + cd .. && miniperl -Ilib make_patchnum.pl && cd win32 # make sure that we recompile perl.c if the git version changes ..\perl$(o) : ..\git_version.h -- 2.7.4