experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix double expansion of ${datadir}

Browse source
This commit is contained in:
Philip Prindeville 2023-08-18 16:38:57 -06:00 • committed by Olof Hagsand
parent 2bcd429bee
commit 3bd440eaaa
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -3,7 +3,7 @@
#
# Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
# Copyright (C) 2017-2019 Olof Hagsand
# Copyright (C) 2020-2022 Olof Hagsand and Rubicon Communications, LLC
# Copyright (C) 2020-2023 Olof Hagsand and Rubicon Communications, LLC
#
# This file is part of CLIXON
#
@ -123,7 +123,9 @@ AC_SUBST(YANG_STANDARD_DIR)
AC_SUBST(MIB_GENERATED_YANG_DIR)
# Used in expansion in, e.g., example/main/example.xml.in
AC_SUBST(SYSCONFDIR)
AC_SUBST(DATADIR)
AC_SUBST(LIBDIR)
AC_SUBST(LIBEXECDIR)
AC_SUBST(LOCALSTATEDIR)
#
@ -420,7 +422,9 @@ AH_BOTTOM([#include <clixon_custom.h>])
# Special case is $libdir, which is composed from $exec_prefix
test "x$prefix" = xNONE && prefix=$ac_default_prefix
SYSCONFDIR=`eval echo $sysconfdir`
DATADIR=`eval echo \`eval echo $datadir\``
LIBDIR=`eval echo $libdir`
LIBEXECDIR=`eval echo $libexecdir`
LOCALSTATEDIR=`eval echo $localstatedir`
AC_CONFIG_FILES([Makefile