This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] support: Add support_install_rootsbindir
- From: Alexandra Hájková <alexandra dot khirnova at gmail dot com>
- To: libc-alpha at sourceware dot org, mcermak at redhat dot com
- Cc: Alexandra Hájková <ahajkova at redhat dot com>
- Date: Tue, 14 May 2019 12:21:38 +0200
- Subject: [PATCH] support: Add support_install_rootsbindir
From: Alexandra Hájková <ahajkova@redhat.com>
---
support/Makefile | 3 ++-
support/support.h | 2 ++
support/support_paths.c | 6 ++++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/support/Makefile b/support/Makefile
index 64044f6f5c..3ed607a79b 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -179,7 +179,8 @@ CFLAGS-support_paths.c = \
-DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \
-DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \
-DINSTDIR_PATH=\"$(prefix)\" \
- -DLIBDIR_PATH=\"$(libdir)\"
+ -DLIBDIR_PATH=\"$(libdir)\" \
+ -DROOTSBINDIR_PATH=\"$(rootsbindir)\"
ifeq (,$(CXX))
LINKS_DSO_PROGRAM = links-dso-program-c
diff --git a/support/support.h b/support/support.h
index 97fef2cd23..c5297a642d 100644
--- a/support/support.h
+++ b/support/support.h
@@ -106,6 +106,8 @@ extern const char support_install_prefix[];
/* Corresponds to the install's lib/ or lib64/ directory. */
extern const char support_libdir_prefix[];
+extern const char support_install_rootsbindir[];
+
extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *,
size_t, unsigned int);
diff --git a/support/support_paths.c b/support/support_paths.c
index 937e6e1012..c54be4faf6 100644
--- a/support/support_paths.c
+++ b/support/support_paths.c
@@ -57,3 +57,9 @@ const char support_libdir_prefix[] = LIBDIR_PATH;
#else
# error please -DLIBDIR_PATH=something in the Makefile
#endif
+
+#ifdef ROOTSBINDIR_PATH
+const char support_install_rootsbindir[] = ROOTSBINDIR_PATH;
+#else
+# error please -DROOTSBINDIR_PATH=something in the Makefile
+#endif
--
2.17.2