* [PATCH] support: Add support_slibdir_prefix variable
@ 2020-12-11 16:52 Florian Weimer
2020-12-11 17:19 ` Carlos O'Donell
0 siblings, 1 reply; 2+ messages in thread
From: Florian Weimer @ 2020-12-11 16:52 UTC (permalink / raw)
To: libc-alpha
---
support/Makefile | 1 +
support/support.h | 2 ++
support/support_paths.c | 7 +++++++
3 files changed, 10 insertions(+)
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;
--
Red Hat GmbH, https://de.redhat.com/ , Registered seat: Grasbrunn,
Commercial register: Amtsgericht Muenchen, HRB 153243,
Managing Directors: Charles Cachera, Brian Klemm, Laurie Krebs, Michael O'Neill
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] support: Add support_slibdir_prefix variable
2020-12-11 16:52 [PATCH] support: Add support_slibdir_prefix variable Florian Weimer
@ 2020-12-11 17:19 ` Carlos O'Donell
0 siblings, 0 replies; 2+ messages in thread
From: Carlos O'Donell @ 2020-12-11 17:19 UTC (permalink / raw)
To: Florian Weimer, libc-alpha
On 12/11/20 11:52 AM, Florian Weimer via Libc-alpha wrote:
> ---
> support/Makefile | 1 +
> support/support.h | 2 ++
> support/support_paths.c | 7 +++++++
> 3 files changed, 10 insertions(+)
LGTM.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
>
> 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;
>
--
Cheers,
Carlos.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-11 17:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-11 16:52 [PATCH] support: Add support_slibdir_prefix variable Florian Weimer
2020-12-11 17:19 ` Carlos O'Donell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).