From 75c51570c710aa9c6df6b7a1e131392e1408c63f Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 20 May 2019 21:08:40 +0200 Subject: support: Expose sbindir as support_sbindir_prefix --- support/Makefile | 1 + support/support.h | 2 ++ support/support_paths.c | 7 +++++++ 3 files changed, 10 insertions(+) (limited to 'support') diff --git a/support/Makefile b/support/Makefile index 18d39f5..56c1ed4 100644 --- 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 13076b7..d72f807 100644 --- 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 1fe3283..ff1df2b 100644 --- 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; -- cgit v1.1