From: Romain Geissler <romain.geissler@gmail.com>
To: libc-alpha@sourceware.org
Cc: romain.geissler@amadeus.com
Subject: [PATCH 1/3] support: introduce support_sysconfdir_prefix
Date: Sun, 26 Mar 2023 20:00:14 +0000 [thread overview]
Message-ID: <20230326200016.219-2-romain.geissler@amadeus.com> (raw)
In-Reply-To: <20230326200016.219-1-romain.geissler@amadeus.com>
---
support/Makefile | 3 ++-
support/support.h | 2 ++
support/support_paths.c | 7 +++++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/support/Makefile b/support/Makefile
index 05b31159ea5..71d51485132 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -231,7 +231,8 @@ CFLAGS-support_paths.c = \
-DSBINDIR_PATH=\"$(sbindir)\" \
-DSLIBDIR_PATH=\"$(slibdir)\" \
-DROOTSBINDIR_PATH=\"$(rootsbindir)\" \
- -DCOMPLOCALEDIR_PATH=\"$(complocaledir)\"
+ -DCOMPLOCALEDIR_PATH=\"$(complocaledir)\" \
+ -DSYSCONFDIR_PATH=\"$(sysconfdir)\"
# In support_timespec_check_in_range we may be passed a very tight
# range for which we should produce a correct result for expected
diff --git a/support/support.h b/support/support.h
index 525ff1ebcec..b7f76bf0809 100644
--- a/support/support.h
+++ b/support/support.h
@@ -144,6 +144,8 @@ extern const char support_slibdir_prefix[];
extern const char support_install_rootsbindir[];
/* Corresponds to the install's compiled locale directory. */
extern const char support_complocaledir_prefix[];
+/* Corresponds to the install's etc/ directory. */
+extern const char support_sysconfdir_prefix[];
/* Copies the file at the path FROM to TO. If TO does not exist, it
is created. If TO is a regular file, it is truncated before
diff --git a/support/support_paths.c b/support/support_paths.c
index f9d75998cf2..0710bcd4122 100644
--- a/support/support_paths.c
+++ b/support/support_paths.c
@@ -92,3 +92,10 @@ const char support_complocaledir_prefix[] = COMPLOCALEDIR_PATH;
#else
# error please -DCOMPLOCALEDIR_PATH=something in the Makefile
#endif
+
+#ifdef SYSCONFDIR_PATH
+/* Corresponds to the install's etc/ directory. */
+const char support_sysconfdir_prefix[] = SYSCONFDIR_PATH;
+#else
+# error please -DSYSCONFDIR_PATH=something in the Makefile
+#endif
--
2.31.1
next prev parent reply other threads:[~2023-03-26 20:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-26 20:00 [PATCH 0/3] Fix tst-ldconfig-ld_so_conf-update and tst-glibc-hwcaps-prepend-cache with custom configure prefix value Romain Geissler
2023-03-26 20:00 ` Romain Geissler [this message]
2023-03-27 17:24 ` [PATCH 1/3] support: introduce support_sysconfdir_prefix Adhemerval Zanella Netto
2023-03-26 20:00 ` [PATCH 2/3] Fix tst-ldconfig-ld_so_conf-update with custom configure prefix value Romain Geissler
2023-03-27 17:24 ` Adhemerval Zanella Netto
2023-03-26 20:00 ` [PATCH 3/3] Fix tst-glibc-hwcaps-prepend-cache " Romain Geissler
2023-03-27 17:24 ` Adhemerval Zanella Netto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230326200016.219-2-romain.geissler@amadeus.com \
--to=romain.geissler@gmail.com \
--cc=libc-alpha@sourceware.org \
--cc=romain.geissler@amadeus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).