(original) (raw)

changeset: 104771:86577b7100a4 branch: 3.6 parent: 104765:df28e536f19d user: Xavier de Gaye xdegaye@users.sourceforge.net date: Fri Oct 28 11:22:05 2016 +0200 files: Makefile.pre.in description: Issue #28046: Fix the removal of the sysconfigdata module from lib-dynload on install. diff -r df28e536f19d -r 86577b7100a4 Makefile.pre.in --- a/Makefile.pre.in Fri Oct 28 09🔞30 2016 +0300 +++ b/Makefile.pre.in Fri Oct 28 11:22:05 2016 +0200 @@ -1302,8 +1302,6 @@ done (INSTALLDATA)cˋatpybuilddir.txt/ˋsysconfigdata(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_(INSTALLDATA)cˋatpybuilddir.txt/ˋ​sysconfigdata(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \ (DESTDIR)(DESTDIR)(DESTDIR)(LIBDEST); \ - echo (INSTALLDATA)cˋatpybuilddir.txt/ˋsysconfigdata(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_(INSTALLDATA)cˋatpybuilddir.txt/ˋ​sysconfigdata(ABIFLAGS).py \ - (LIBDEST)(LIBDEST) (LIBDEST)(INSTALL_DATA) (srcdir)/LICENSE(srcdir)/LICENSE (srcdir)/LICENSE(DESTDIR)$(LIBDEST)/LICENSE.txt if test -d (DESTDIR)(DESTDIR)(DESTDIR)(LIBDEST)/distutils/tests; then \ (INSTALLDATA)(INSTALL_DATA) (INSTALLDATA)(srcdir)/Modules/xxmodule.c \ @@ -1437,7 +1435,7 @@ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ --root=$(DESTDIR)/ - -rm (DESTDIR)(DESTDIR)(DESTDIR)(DESTSHARED)/_sysconfigdata_$(ABIFLAGS).py + -rm (DESTDIR)(DESTDIR)(DESTDIR)(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py -rm -r (DESTDIR)(DESTDIR)(DESTDIR)(DESTSHARED)/__pycache__ # Here are a couple of targets for MacOSX again, to install a full /xdegaye@users.sourceforge.net