support: Export bindir path on support_path

Checked on x86_64-linux-gnu.

	* support/Makefile (CFLAGS-support_paths.c): Add -DBINDIR_PATH.
	* support/support.h (support_bindir_prefix): New variable.
	* support/support_paths.c [BINDIR_PATH] (support_bindir_prefix):

Reviewed-by: DJ Delorie <dj@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index b400217277d348d7461f36abf81d08561e0400e7..9a4c89d42f548a4da446a574aef23037dde823e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2019-05-14  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
+       * support/Makefile (CFLAGS-support_paths.c): Add -DBINDIR_PATH.
+       * support/support.h (support_bindir_prefix): New variable.
+       * support/support_paths.c [BINDIR_PATH] (support_bindir_prefix):
+
        * config.make.in (bindir): New variable.
 
        * sysdeps/nptl/lowlevellock.h (__lll_trylock): New macro.

diff --git a/support/Makefile b/support/Makefile
index 64044f6f5c92e990ec5d41c322cb0a83f4e9b132..fe416cdc5f1f3bd87e31a81d6843418d346f5081 100644 (file)
--- 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)\" \
+               -DBINDIR_PATH=\"$(bindir)\"
 
 ifeq (,$(CXX))
 LINKS_DSO_PROGRAM = links-dso-program-c

diff --git a/support/support.h b/support/support.h
index 97fef2cd23579fdbb3cd42c20401b5e27c44f573..b162491be6ac08ceb2f13c7c9c423566cef3f9c4 100644 (file)
--- a/support/support.h
+++ b/support/support.h
@@ -105,6 +105,8 @@ extern const char support_objdir_elf_ldso[];
 extern const char support_install_prefix[];
 /* Corresponds to the install's lib/ or lib64/ directory.  */
 extern const char support_libdir_prefix[];
+/* Corresponds to the install's bin/ directory.  */
+extern const char support_bindir_prefix[];
 
 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 937e6e1012d696c4f8aa3f8dd05f31429b874021..75634aab9a3d2a633813f9d23d7d80b74fcd9d02 100644 (file)
--- a/support/support_paths.c
+++ b/support/support_paths.c
@@ -57,3 +57,10 @@ const char support_libdir_prefix[] = LIBDIR_PATH;
 #else
 # error please -DLIBDIR_PATH=something in the Makefile
 #endif
+
+#ifdef BINDIR_PATH
+/* Corresponds to the install's bin/ directory.  */
+const char support_bindir_prefix[] = BINDIR_PATH;
+#else
+# error please -DBINDIR_PATH=something in the Makefile
+#endif