diff mbox series

support: Add support_slibdir_prefix variable

Message ID 87o8j0uvxy.fsf@oldenburg2.str.redhat.com
State Committed
Commit cb81264fd9973cd95bbc71495185b98979d28918
Headers
Series support: Add support_slibdir_prefix variable |

Commit Message

Florian Weimer Dec. 11, 2020, 4:52 p.m. UTC 
  ---
 support/Makefile        | 1 +
 support/support.h       | 2 ++
 support/support_paths.c | 7 +++++++
 3 files changed, 10 insertions(+)

Comments

Carlos O'Donell Dec. 11, 2020, 5:19 p.m. UTC | #1 
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;
>
diff mbox series

Patch

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;