[Python-checkins] cpython (merge 3.5 -> default): Issue #27229: Merge makefile fix from 3.5

Mon Jun 6 21:11:47 EDT 2016

https://hg.python.org/cpython/rev/b7a4c076ba40
changeset: 101774:b7a4c076ba40
parent: 101770:9902230b101f
parent: 101773:de5b85f96266
user: Martin Panter <vadmium+py at gmail.com>
date: Tue Jun 07 01:08:48 2016 +0000
summary:
 Issue #27229: Merge makefile fix from 3.5
files:
 Makefile.pre.in | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -790,10 +790,10 @@
 
 $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
 	@$(MKDIR_P) Include
+	# Avoid copying the file onto itself for an in-tree build
 	if test "$(cross_compiling)" != "yes"; then \
 		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
 	else \
-		# Avoid copying the file onto itself for an in-tree build \
 		cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \
 		mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \
 	fi
-- 
Repository URL: https://hg.python.org/cpython
