mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
support: Expose sbindir as support_sbindir_prefix
This commit is contained in:
parent
b62bb3bc68
commit
75c51570c7
@ -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
|
||||
|
@ -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))
|
||||
|
@ -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 *,
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user