aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandra Hájková <ahajkova@redhat.com>2019-05-13 19:31:53 +0200
committerAlexandra Hajkova <ahajkova@redhat.com>2019-05-15 11:37:26 +0200
commitd50f09181eca10a91fd9035bb90711b265770dc9 (patch)
tree2883289b41a386834fc7601bc44ecaf28975e308
parent7ac6fad987c28dc5e0e7964084260f163179be68 (diff)
downloadglibc-d50f09181eca10a91fd9035bb90711b265770dc9.tar.gz
glibc-d50f09181eca10a91fd9035bb90711b265770dc9.tar.xz
glibc-d50f09181eca10a91fd9035bb90711b265770dc9.zip
support: Add support_install_rootsbindir
Reviewed by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-rw-r--r--ChangeLog5
-rw-r--r--support/Makefile3
-rw-r--r--support/support.h2
-rw-r--r--support/support_paths.c7
4 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b4fac47552..dc4a814c3ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-15 Alexandra Hajkova <ahajkova@redhat.com>
+ * support/support.h (support_install_rootsbindir): New variable.
+ * support/support_paths.c: Likewise.
+ * support/Makefile (CFLAGS-support_paths.c): Add -DROOTSBINDIR_PATH.
+
2019-05-15 Florian Weimer <fweimer@redhat.com>
* iconv/gconv.h (__gconv_transliterate): Move declaration …
diff --git a/support/Makefile b/support/Makefile
index fe416cdc5f1..18d39f5a50a 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -180,7 +180,8 @@ CFLAGS-support_paths.c = \
-DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \
-DINSTDIR_PATH=\"$(prefix)\" \
-DLIBDIR_PATH=\"$(libdir)\" \
- -DBINDIR_PATH=\"$(bindir)\"
+ -DBINDIR_PATH=\"$(bindir)\" \
+ -DROOTSBINDIR_PATH=\"$(rootsbindir)\"
ifeq (,$(CXX))
LINKS_DSO_PROGRAM = links-dso-program-c
diff --git a/support/support.h b/support/support.h
index b162491be6a..13076b75ba4 100644
--- a/support/support.h
+++ b/support/support.h
@@ -107,6 +107,8 @@ extern const char support_install_prefix[];
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_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 75634aab9a3..1fe32835b1d 100644
--- a/support/support_paths.c
+++ b/support/support_paths.c
@@ -64,3 +64,10 @@ const char support_bindir_prefix[] = BINDIR_PATH;
#else
# error please -DBINDIR_PATH=something in the Makefile
#endif
+
+#ifdef ROOTSBINDIR_PATH
+/* Corresponds to the install's sbin/ directory. */
+const char support_install_rootsbindir[] = ROOTSBINDIR_PATH;
+#else
+# error please -DROOTSBINDIR_PATH=something in the Makefile
+#endif