diff --git a/configure b/configure
index ac62ec50..4b815a3c 100755
--- a/configure
+++ b/configure
@@ -663,7 +663,9 @@ CXXFLAGS
 CXX
 CPP
 LOCALSTATEDIR
+LIBEXECDIR
 LIBDIR
+DATADIR
 SYSCONFDIR
 MIB_GENERATED_YANG_DIR
 YANG_STANDARD_DIR
@@ -4144,6 +4146,8 @@ HAVE_HTTP1=false
 
 
 
+
+
 #
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -6891,7 +6895,9 @@ fi
 # 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="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile apps/snmp/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile example/main/Makefile example/main/example.xml docker/Makefile docker/clixon-dev/Makefile docker/example/Makefile docker/test/Makefile util/Makefile yang/Makefile yang/clixon/Makefile yang/mandatory/Makefile doc/Makefile test/Makefile test/config.sh test/cicd/Makefile test/vagrant/Makefile"
diff --git a/configure.ac b/configure.ac
index 17e65317..518f3cb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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