LIBC_SLIBDIR_RTLDDIR: substitute arguments in single quotes

The arguments of the LIBC_SLIBDIR_RTLDDIR macro are used both in unquoted
and single quoted context, so that neither shell nor makefile variable
references work.  Consistently put them in single quotes so that they can
refer to makefile variables.

diff --git a/ChangeLog b/ChangeLog
index 70f7d61aad826b72ad8fcc47c2f7afcf6123be5f..67131c816bd3a2810c48cad88cd11688694d5f48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2018-01-25  Andreas Schwab  <schwab@suse.de>
+
+       * aclocal.m4 (LIBC_SLIBDIR_RTLDDIR): Consistently put arguments in
+       single quotes.
+       * sysdeps/gnu/configure: Regenerate.
+       * sysdeps/unix/sysv/linux/aarch64/configure: Regenerate.
+       * sysdeps/unix/sysv/linux/mips/configure: Regenerate.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/configure: Regenerate.
+       * sysdeps/unix/sysv/linux/s390/s390-64/configure: Regenerate.
+       * sysdeps/unix/sysv/linux/sparc/sparc64/configure: Regenerate.
+       * sysdeps/unix/sysv/linux/tile/configure: Regenerate.
+       * sysdeps/unix/sysv/linux/x86_64/64/configure: Regenerate.
+       * sysdeps/unix/sysv/linux/x86_64/x32/configure: Regenerate.
+
 2018-01-25  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
        * scripts/build-many-glibcs.py (checkout_vcs): Add hurd repository

diff --git a/aclocal.m4 b/aclocal.m4
index fe2a3713cc71cd6b67fa492cdcf5cdbe5ec8bab8..08fa1ac6d05323fd0bac1f0d8820ba78ba6cf9a0 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -293,8 +293,8 @@ AC_DEFUN([LIBC_SLIBDIR_RTLDDIR],
 [test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/$1
-  libc_cv_rtlddir=/$2
+  libc_cv_slibdir='/$1'
+  libc_cv_rtlddir='/$2'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/$1';
     # Locale data can be shared between 32-bit and 64-bit libraries.

diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure
index 71243ad0c6ae7451efa15b083662e08038dfdb4d..c15d1087e8fa1359faed8ee45717fb8d3b3876db 100644 (file)
--- a/sysdeps/gnu/configure
+++ b/sysdeps/gnu/configure
@@ -9,8 +9,8 @@
 test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/lib
-  libc_cv_rtlddir=/lib
+  libc_cv_slibdir='/lib'
+  libc_cv_rtlddir='/lib'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib';
     # Locale data can be shared between 32-bit and 64-bit libraries.

diff --git a/sysdeps/unix/sysv/linux/aarch64/configure b/sysdeps/unix/sysv/linux/aarch64/configure
index f48472c5b691e6c6a24459d7ae9a36ecf7128514..27d50e1d3c44c02da9f973de0614be4c7e2ffe84 100644 (file)
--- a/sysdeps/unix/sysv/linux/aarch64/configure
+++ b/sysdeps/unix/sysv/linux/aarch64/configure
@@ -6,8 +6,8 @@ arch_minimum_kernel=3.7.0
 test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/lib64
-  libc_cv_rtlddir=/lib
+  libc_cv_slibdir='/lib64'
+  libc_cv_rtlddir='/lib'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.

diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure
index a5513fad489251745eaeae3cc2468068a23d976b..1ee7f41a363d2e09ddfe5e207725732985478ac7 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/configure
+++ b/sysdeps/unix/sysv/linux/mips/configure
@@ -442,8 +442,8 @@ mips/mips64/n64/*)
   test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/lib64
-  libc_cv_rtlddir=/lib64
+  libc_cv_slibdir='/lib64'
+  libc_cv_rtlddir='/lib64'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.
@@ -456,8 +456,8 @@ mips/mips64/n32/*)
   test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/lib32
-  libc_cv_rtlddir=/lib32
+  libc_cv_slibdir='/lib32'
+  libc_cv_rtlddir='/lib32'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib32';
     # Locale data can be shared between 32-bit and 64-bit libraries.

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
index 4e7fcf1d9787d88d8ac328fbf4cb635f1614cfd1..ae7f254da466e07f60d0471cb9ecefb3bbc6fa0a 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
@@ -4,8 +4,8 @@
 test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/lib64
-  libc_cv_rtlddir=/lib64
+  libc_cv_slibdir='/lib64'
+  libc_cv_rtlddir='/lib64'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/configure b/sysdeps/unix/sysv/linux/s390/s390-64/configure
index 7392cdfb426f63cf892fa2f3ddb2a95395bd2deb..e8e84362d4714925d3eeb2ff355eaadaddf97a43 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-64/configure
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/configure
@@ -4,8 +4,8 @@
 test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/lib64
-  libc_cv_rtlddir=/lib
+  libc_cv_slibdir='/lib64'
+  libc_cv_rtlddir='/lib'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.

diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/configure b/sysdeps/unix/sysv/linux/sparc/sparc64/configure
index 8f88eff4a3afdebe8b2e63c7c4ee17ab98dfae88..4b92a40bd22a8a69895fe3dccf67442c89296a0e 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/configure
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/configure
@@ -4,8 +4,8 @@
 test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/lib64
-  libc_cv_rtlddir=/lib64
+  libc_cv_slibdir='/lib64'
+  libc_cv_rtlddir='/lib64'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.

diff --git a/sysdeps/unix/sysv/linux/tile/configure b/sysdeps/unix/sysv/linux/tile/configure
index 63f9686971e455796853986252193d4239ac0b1e..32ce16c957185d7feb99a0fc122d57c14a059f6f 100644 (file)
--- a/sysdeps/unix/sysv/linux/tile/configure
+++ b/sysdeps/unix/sysv/linux/tile/configure
@@ -8,8 +8,8 @@ tile/tilegx32)
   test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/lib32
-  libc_cv_rtlddir=/lib32
+  libc_cv_slibdir='/lib32'
+  libc_cv_rtlddir='/lib32'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib32';
     # Locale data can be shared between 32-bit and 64-bit libraries.

diff --git a/sysdeps/unix/sysv/linux/x86_64/64/configure b/sysdeps/unix/sysv/linux/x86_64/64/configure
index 9d1a8d271d7e7fbc56d916be25f3c7a52429ea67..9d298faba73b0e3e2b3a68e197be378afa1ecac7 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/64/configure
+++ b/sysdeps/unix/sysv/linux/x86_64/64/configure
@@ -4,8 +4,8 @@
 test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/lib64
-  libc_cv_rtlddir=/lib64
+  libc_cv_slibdir='/lib64'
+  libc_cv_rtlddir='/lib64'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/lib64';
     # Locale data can be shared between 32-bit and 64-bit libraries.

diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/configure b/sysdeps/unix/sysv/linux/x86_64/x32/configure
index 1417da478553d80c01c9d9d40c7369a31210f8e1..4837a308cedbc9096e81fc25d34d4ef5df363c7d 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/x32/configure
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/configure
@@ -6,8 +6,8 @@ arch_minimum_kernel=3.4.0
 test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/libx32
-  libc_cv_rtlddir=/libx32
+  libc_cv_slibdir='/libx32'
+  libc_cv_rtlddir='/libx32'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/libx32';
     # Locale data can be shared between 32-bit and 64-bit libraries.