bpo-40684: Fix make install for platlibdir=lib64 (GH-20736)

"make install" now uses the PLATLIBDIR variable for the destination
lib-dynload/ directory when ./configure --with-platlibdir is used.

Update --with-platlibdir comment in configure.
(cherry picked from commit 51ae31e5b93b986e57a7e18e25f981a6ffcdefb7)

Co-authored-by: Victor Stinner <vstinner@python.org>

diff --git a/Makefile.pre.in b/Makefile.pre.in
index a7d5dd294584c45165c446f337761d9b97556d9b..652efb4ba1bf05a42b79c4c26e3a33b9bfcd5dbd 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -148,7 +148,7 @@ SCRIPTDIR=  $(prefix)/$(PLATLIBDIR)
 ABIFLAGS=      @ABIFLAGS@
 
 # Detailed destination directories
-BINLIBDEST=    $(LIBDIR)/python$(VERSION)
+BINLIBDEST=    @BINLIBDEST@
 LIBDEST=       $(SCRIPTDIR)/python$(VERSION)
 INCLUDEPY=     $(INCLUDEDIR)/python$(LDVERSION)
 CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION)

diff --git a/Misc/NEWS.d/next/Build/2020-06-08-19-57-05.bpo-40684.WIY2-i.rst b/Misc/NEWS.d/next/Build/2020-06-08-19-57-05.bpo-40684.WIY2-i.rst
new file mode 100644 (file)
index 0000000..0495e5e
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2020-06-08-19-57-05.bpo-40684.WIY2-i.rst
@@ -0,0 +1,2 @@
+``make install`` now uses the ``PLATLIBDIR`` variable for the destination
+``lib-dynload/`` directory when ``./configure --with-platlibdir`` is used.

diff --git a/configure b/configure
index b37c695d9c0564503fc2b65ae6f46d006e7b98c3..ca18d2fa7aa48cf25996e8f2663246784e05c39e 100755 (executable)
--- a/configure
+++ b/configure
@@ -632,6 +632,7 @@ THREADHEADERS
 LIBPL
 PY_ENABLE_SHARED
 PLATLIBDIR
+BINLIBDEST
 LIBPYTHON
 EXT_SUFFIX
 ALT_SOABI
@@ -15330,7 +15331,11 @@ else
 fi
 
 
-# Check for --with-libdir-name
+
+BINLIBDEST='$(LIBDIR)/python$(VERSION)'
+
+
+# Check for --with-platlibdir
 # /usr/$LIDIRNAME/python$VERSION
 
 PLATLIBDIR="lib"
@@ -15349,6 +15354,7 @@ then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   PLATLIBDIR="$withval"
+  BINLIBDEST='${exec_prefix}/${PLATLIBDIR}/python$(VERSION)'
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }

diff --git a/configure.ac b/configure.ac
index 2d63198c7b1c9b256f69da8fb5aef8459cf06dc1..bb327f68eb87965bcd846e94c98442d72b314e54 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4770,7 +4770,11 @@ else
 fi
 
 
-# Check for --with-libdir-name
+AC_SUBST(BINLIBDEST)
+BINLIBDEST='$(LIBDIR)/python$(VERSION)'
+
+
+# Check for --with-platlibdir
 # /usr/$LIDIRNAME/python$VERSION
 AC_SUBST(PLATLIBDIR)
 PLATLIBDIR="lib"
@@ -4787,6 +4791,7 @@ if test -n "$withval" -a "$withval" != yes -a "$withval" != no
 then
   AC_MSG_RESULT(yes)
   PLATLIBDIR="$withval"
+  BINLIBDEST='${exec_prefix}/${PLATLIBDIR}/python$(VERSION)'
 else
   AC_MSG_RESULT(no)
 fi],