summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2023-03-23 19:55:14 +0100
committerDonatas Abraitis <donatas@opensourcerouting.org>2023-03-24 18:38:46 +0100
commitc9bdc0c79e0c2a27af94349eb5010175205ee7fb (patch)
tree52be015cc92774b9fa3489f784c45b7e4de03cd1 /configure.ac
parentMerge pull request #13074 from donaldsharp/hash_clean_and_free (diff)
downloadfrr-c9bdc0c79e0c2a27af94349eb5010175205ee7fb.tar.xz
frr-c9bdc0c79e0c2a27af94349eb5010175205ee7fb.zip
tools: Set correct directory of vtysh for frr-reload.py
Before it was setting SDIR, which is /usr/lib/frr, but the vtysh binary is put under bindir (which is /usr/local by default). And running `/usr/lib/frr/frr reload` failed. Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 4b0753633..f3968df2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2693,6 +2693,7 @@ AC_SUBST([vtysh_bin])
CFG_SYSCONF="$sysconfdir"
CFG_SBIN="$sbindir"
+CFG_BIN="$bindir"
CFG_STATE="$frr_statedir"
CFG_MODULE="$moduledir"
CFG_YANGMODELS="$yangmodelsdir"
@@ -2700,6 +2701,7 @@ CFG_SCRIPT="$scriptdir"
for I in 1 2 3 4 5 6 7 8 9 10; do
eval CFG_SYSCONF="\"$CFG_SYSCONF\""
eval CFG_SBIN="\"$CFG_SBIN\""
+ eval CFG_BIN="\"$CFG_BIN\""
eval CFG_STATE="\"$CFG_STATE\""
eval CFG_MODULE="\"$CFG_MODULE\""
eval CFG_YANGMODELS="\"$CFG_YANGMODELS\""
@@ -2707,6 +2709,7 @@ for I in 1 2 3 4 5 6 7 8 9 10; do
done
AC_SUBST([CFG_SYSCONF])
AC_SUBST([CFG_SBIN])
+AC_SUBST([CFG_BIN])
AC_SUBST([CFG_STATE])
AC_SUBST([CFG_MODULE])
AC_SUBST([CFG_SCRIPT])