[1/3] support: introduce support_sysconfdir_prefix
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
---
support/Makefile | 3 ++-
support/support.h | 2 ++
support/support_paths.c | 7 +++++++
3 files changed, 11 insertions(+), 1 deletion(-)
Comments
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
On 26/03/23 17:00, Romain Geissler via Libc-alpha wrote:
> ---
> 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
@@ -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
@@ -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
@@ -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