support: Add support_slibdir_prefix variable

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

diff --git a/support/Makefile b/support/Makefile
index f5f59bf8d2c892e8d063f263b24724622684df57..3198eb50222a128e8142364bec2797ae20e7dfce 100644 (file)
--- 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 abda3a69f1ae64738805769464ab6a24f4a66afc..96971f83ac30ebe031bc3697457b3f87e8187d16 100644 (file)
--- 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 edc65113042a5eb6ead0e1004094a5b6f2688bf4..514273444ad7e07adc92d76071d6605da572ec0d 100644 (file)
--- 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;