diff options
| author | Florian Weimer <fweimer@redhat.com> | 2020-12-11 17:24:08 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-12-11 18:30:57 +0100 |
| commit | cb81264fd9973cd95bbc71495185b98979d28918 (patch) | |
| tree | 16495644fed9aebadf133440b05a3c97f6d23991 /support | |
| parent | cd543b5eb3642d76e365a131ce676f31fe3f1dd4 (diff) | |
| download | glibc-cb81264fd9973cd95bbc71495185b98979d28918.tar.gz glibc-cb81264fd9973cd95bbc71495185b98979d28918.tar.xz glibc-cb81264fd9973cd95bbc71495185b98979d28918.zip | |
support: Add support_slibdir_prefix variable
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'support')
| -rw-r--r-- | support/Makefile | 1 | ||||
| -rw-r--r-- | support/support.h | 2 | ||||
| -rw-r--r-- | support/support_paths.c | 7 |
3 files changed, 10 insertions, 0 deletions
diff --git a/support/Makefile b/support/Makefile index f5f59bf8d2..3198eb5022 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 abda3a69f1..96971f83ac 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 edc6511304..514273444a 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; |