| Message ID | 20210209154536.10851-2-olaf@aepfle.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tools changes | expand |
Olaf Hering writes ("[PATCH v20210209 1/4] tools: move CONFIG_DIR and XEN_CONFIG_DIR in paths.m4"):
> Upcoming changes need to reuse XEN_CONFIG_DIR.
>
> In its current location the assignment happens too late. Move it up
> in the file, along with CONFIG_DIR. Their only dependency is
> sysconfdir, which may also be adjusted in this file.
Reviewed-by: Ian Jackson <iwj@xenproject.org>
Release-Acked-by: Ian Jackson <iwj@xenproject.org>
diff --git a/m4/paths.m4 b/m4/paths.m4 index 1c107b1a61..a736f57d8d 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -34,6 +34,12 @@ if test "x$sysconfdir" = 'x${prefix}/etc' ; then esac fi +CONFIG_DIR=$sysconfdir +AC_SUBST(CONFIG_DIR) + +XEN_CONFIG_DIR=$CONFIG_DIR/xen +AC_SUBST(XEN_CONFIG_DIR) + AC_ARG_WITH([initddir], AS_HELP_STRING([--with-initddir=DIR], [Path to directory with sysv runlevel scripts. [SYSCONFDIR/init.d]]), @@ -128,15 +134,9 @@ AC_SUBST(XEN_LIB_DIR) SHAREDIR=$prefix/share AC_SUBST(SHAREDIR) -CONFIG_DIR=$sysconfdir -AC_SUBST(CONFIG_DIR) - INITD_DIR=$initddir_path AC_SUBST(INITD_DIR) -XEN_CONFIG_DIR=$CONFIG_DIR/xen -AC_SUBST(XEN_CONFIG_DIR) - XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts AC_SUBST(XEN_SCRIPT_DIR)
Upcoming changes need to reuse XEN_CONFIG_DIR. In its current location the assignment happens too late. Move it up in the file, along with CONFIG_DIR. Their only dependency is sysconfdir, which may also be adjusted in this file. No functional change intended. Signed-off-by: Olaf Hering <olaf@aepfle.de> --- m4/paths.m4 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)