From 07b80bffb56aeac6c7beb82015a8ea877314f96d Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 1 Jul 2019 14:23:52 +0200 Subject: [PATCH 1/2] bpo-37468: make install no longer install wininst-*.exe files make install no longer installs "wininst-*.exe" files used by distutils bdist_wininst: bdist_wininst only works on Windows. --- Makefile.pre.in | 3 +++ .../NEWS.d/next/Build/2019-07-01-14-39-40.bpo-37468.trbQ-_.rst | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 Misc/NEWS.d/next/Build/2019-07-01-14-39-40.bpo-37468.trbQ-_.rst diff --git a/Makefile.pre.in b/Makefile.pre.in index ef9a4f88598f13..1cdeb97deaa6a2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1419,6 +1419,8 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c echo $(INSTALL_DATA) $$i $(LIBDEST); \ fi; \ done + @# bpo-37468: Don't install distutils/command/wininst-*.exe files used + @# by distutils bdist_wininst: bdist_wininst only works on Windows. @for d in $(LIBSUBDIRS); \ do \ a=$(srcdir)/Lib/$$d; \ @@ -1431,6 +1433,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c *CVS) ;; \ *.py[co]) ;; \ *.orig) ;; \ + *wininst-*.exe) ;; \ *~) ;; \ *) \ if test -d $$i; then continue; fi; \ diff --git a/Misc/NEWS.d/next/Build/2019-07-01-14-39-40.bpo-37468.trbQ-_.rst b/Misc/NEWS.d/next/Build/2019-07-01-14-39-40.bpo-37468.trbQ-_.rst new file mode 100644 index 00000000000000..b8c70d574076cf --- /dev/null +++ b/Misc/NEWS.d/next/Build/2019-07-01-14-39-40.bpo-37468.trbQ-_.rst @@ -0,0 +1,2 @@ +``make install`` no longer installs ``wininst-*.exe`` files used by +distutils bdist_wininst: bdist_wininst only works on Windows. From abff7290a3dd2ad139a505a10780ebe20a4b7400 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sun, 14 Jul 2019 19:35:47 +0200 Subject: [PATCH 2/2] Move the comment --- Makefile.pre.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 1cdeb97deaa6a2..94a1208efa094c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1419,8 +1419,6 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c echo $(INSTALL_DATA) $$i $(LIBDEST); \ fi; \ done - @# bpo-37468: Don't install distutils/command/wininst-*.exe files used - @# by distutils bdist_wininst: bdist_wininst only works on Windows. @for d in $(LIBSUBDIRS); \ do \ a=$(srcdir)/Lib/$$d; \ @@ -1433,6 +1431,8 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c *CVS) ;; \ *.py[co]) ;; \ *.orig) ;; \ + # bpo-37468: Don't install distutils/command/wininst-*.exe files used \ + # by distutils bdist_wininst: bdist_wininst only works on Windows. \ *wininst-*.exe) ;; \ *~) ;; \ *) \