support: Expose sbindir as support_sbindir_prefix

diff --git a/ChangeLog b/ChangeLog
index 35e694afad51cf327ec7bddf7183b332a5a3d86a..621898902179df62b7b026b8273de70905e86a13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-05-20  Florian Weimer  <fweimer@redhat.com>
+
+       * support/support.h (support_sbindir_prefix): Declare.
+       (support_install_rootsbindir): Update comment.
+       * support/Makefile (CFLAGS-support_paths.c): Define SBINDIR_PATH.
+       * support/support_paths.c (support_sbindir_prefix): Define.
+
 2019-05-20  Mike Crowe  <mac@mcrowe.com>
 
        * support/timespec.c: Add backslash to correct newline in failure

diff --git a/support/Makefile b/support/Makefile
index 18d39f5a50aa82b1809021959ae314e7887d01ed..56c1ed43bb98896b95aaaa75e273c1ea095edb74 100644 (file)
--- a/support/Makefile
+++ b/support/Makefile
@@ -181,6 +181,7 @@ CFLAGS-support_paths.c = \
                -DINSTDIR_PATH=\"$(prefix)\" \
                -DLIBDIR_PATH=\"$(libdir)\" \
                -DBINDIR_PATH=\"$(bindir)\" \
+               -DSBINDIR_PATH=\"$(sbindir)\" \
                -DROOTSBINDIR_PATH=\"$(rootsbindir)\"
 
 ifeq (,$(CXX))

diff --git a/support/support.h b/support/support.h
index 13076b75ba4fc776b5961b921e4fa559d246330a..d72f807477c1a0a6a67d055ed47705d5e92e1cbd 100644 (file)
--- a/support/support.h
+++ b/support/support.h
@@ -108,6 +108,8 @@ extern const char support_libdir_prefix[];
 /* Corresponds to the install's bin/ directory.  */
 extern const char support_bindir_prefix[];
 /* Corresponds to the install's sbin/ directory.  */
+extern const char support_sbindir_prefix[];
+/* Corresponds to the install's sbin/ directory (without prefix).  */
 extern const char support_install_rootsbindir[];
 
 extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *,

diff --git a/support/support_paths.c b/support/support_paths.c
index 1fe32835b1df08fd6efb3c041418a88a39e69c48..ff1df2bf2076b26f3fe0fd87259eb45943b7d991 100644 (file)
--- a/support/support_paths.c
+++ b/support/support_paths.c
@@ -65,6 +65,13 @@ const char support_bindir_prefix[] = BINDIR_PATH;
 # error please -DBINDIR_PATH=something in the Makefile
 #endif
 
+#ifdef SBINDIR_PATH
+/* Corresponds to the install's bin/ directory.  */
+const char support_sbindir_prefix[] = SBINDIR_PATH;
+#else
+# error please -DSBINDIR_PATH=something in the Makefile
+#endif
+
 #ifdef ROOTSBINDIR_PATH
 /* Corresponds to the install's sbin/ directory.  */
 const char support_install_rootsbindir[] = ROOTSBINDIR_PATH;