From: Florian Weimer Date: Fri, 11 Dec 2020 16:24:08 +0000 (+0100) Subject: support: Add support_slibdir_prefix variable X-Git-Tag: glibc-2.33~199 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb81264fd9973cd95bbc71495185b98979d28918;p=thirdparty%2Fglibc.git support: Add support_slibdir_prefix variable Reviewed-by: Carlos O'Donell --- diff --git a/support/Makefile b/support/Makefile index f5f59bf8d2c..3198eb50222 100644 --- a/support/Makefile +++ b/support/Makefile @@ -196,6 +196,7 @@ CFLAGS-support_paths.c = \ -DLIBDIR_PATH=\"$(libdir)\" \ -DBINDIR_PATH=\"$(bindir)\" \ -DSBINDIR_PATH=\"$(sbindir)\" \ + -DSLIBDIR_PATH=\"$(slibdir)\" \ -DROOTSBINDIR_PATH=\"$(rootsbindir)\" \ -DCOMPLOCALEDIR_PATH=\"$(complocaledir)\" diff --git a/support/support.h b/support/support.h index abda3a69f1a..96971f83ac3 100644 --- a/support/support.h +++ b/support/support.h @@ -114,6 +114,8 @@ extern const char support_libdir_prefix[]; extern const char support_bindir_prefix[]; /* Corresponds to the install's sbin/ directory. */ extern const char support_sbindir_prefix[]; +/* Corresponds to the install's system /lib or /lib64 directory. */ +extern const char support_slibdir_prefix[]; /* Corresponds to the install's sbin/ directory (without prefix). */ extern const char support_install_rootsbindir[]; /* Corresponds to the install's compiled locale directory. */ diff --git a/support/support_paths.c b/support/support_paths.c index edc65113042..514273444ad 100644 --- a/support/support_paths.c +++ b/support/support_paths.c @@ -72,6 +72,13 @@ const char support_sbindir_prefix[] = SBINDIR_PATH; # error please -DSBINDIR_PATH=something in the Makefile #endif +#ifdef SLIBDIR_PATH +/* Corresponds to the system /lib or /lib64 directory. */ +const char support_slibdir_prefix[] = SLIBDIR_PATH; +#else +# error please -DSLIBDIR_PATH=something in the Makefile +#endif + #ifdef ROOTSBINDIR_PATH /* Corresponds to the install's sbin/ directory. */ const char support_install_rootsbindir[] = ROOTSBINDIR_PATH;