changeset:   104772:28205c4cf20b
parent:      104766:aa891d13e1cf
parent:      104771:86577b7100a4
user:        Xavier de Gaye <xdegaye@users.sourceforge.net>
date:        Fri Oct 28 11:23:24 2016 +0200
files:       Makefile.pre.in
description:
Issue #28046: Merge with 3.6.


diff -r aa891d13e1cf -r 28205c4cf20b Makefile.pre.in
--- a/Makefile.pre.in	Fri Oct 28 09:19:19 2016 +0300
+++ b/Makefile.pre.in	Fri Oct 28 11:23:24 2016 +0200
@@ -1302,8 +1302,6 @@
 	done
 	$(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
 		$(DESTDIR)$(LIBDEST); \
-	echo $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS).py \
-		$(LIBDEST)
 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
 	if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
@@ -1437,7 +1435,7 @@
 		--install-scripts=$(BINDIR) \
 		--install-platlib=$(DESTSHARED) \
 		--root=$(DESTDIR)/
-	-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS).py
+	-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
 	-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
 
 # Here are a couple of targets for MacOSX again, to install a full