changeset:   101774:b7a4c076ba40
parent:      101770:9902230b101f
parent:      101773:de5b85f96266
user:        Martin Panter <vadmium+py@gmail.com>
date:        Tue Jun 07 01:08:48 2016 +0000
files:       Makefile.pre.in
description:
Issue #27229: Merge makefile fix from 3.5


diff -r 9902230b101f -r b7a4c076ba40 Makefile.pre.in
--- a/Makefile.pre.in	Tue Jun 07 00:30:49 2016 +0000
+++ b/Makefile.pre.in	Tue Jun 07 01:08:48 2016 +0000
@@ -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