AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-08 14:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

support: Expose sbindir as support_sbindir_prefix

Browse Source
This commit is contained in:
Florian Weimer 2019-05-20 21:08:40 +02:00
parent b62bb3bc68
commit 75c51570c7
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2019-05-20 Mike Crowe <mac@mcrowe.com>
* support/timespec.c: Add backslash to correct newline in failure * support/timespec.c: Add backslash to correct newline in failure

1
support/Makefile
View File

@ -181,6 +181,7 @@ CFLAGS-support_paths.c = \
-DINSTDIR_PATH=\"$(prefix)\" \ -DINSTDIR_PATH=\"$(prefix)\" \
-DLIBDIR_PATH=\"$(libdir)\" \ -DLIBDIR_PATH=\"$(libdir)\" \
-DBINDIR_PATH=\"$(bindir)\" \ -DBINDIR_PATH=\"$(bindir)\" \
-DSBINDIR_PATH=\"$(sbindir)\" \
-DROOTSBINDIR_PATH=\"$(rootsbindir)\" -DROOTSBINDIR_PATH=\"$(rootsbindir)\"
ifeq (,$(CXX)) ifeq (,$(CXX))

2
support/support.h
View File

@ -108,6 +108,8 @@ extern const char support_libdir_prefix[];
/* Corresponds to the install's bin/ directory. */ /* Corresponds to the install's bin/ directory. */
extern const char support_bindir_prefix[]; extern const char support_bindir_prefix[];
/* Corresponds to the install's sbin/ directory. */ /* 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 const char support_install_rootsbindir[];
extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *, extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *,

7
support/support_paths.c
View File

@ -65,6 +65,13 @@ const char support_bindir_prefix[] = BINDIR_PATH;
# error please -DBINDIR_PATH=something in the Makefile # error please -DBINDIR_PATH=something in the Makefile
#endif #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 #ifdef ROOTSBINDIR_PATH
/* Corresponds to the install's sbin/ directory. */ /* Corresponds to the install's sbin/ directory. */
const char support_install_rootsbindir[] = ROOTSBINDIR_PATH; const char support_install_rootsbindir[] = ROOTSBINDIR_PATH;