From 9cd764f0310aeffdcd7c2cf42d46690a9493b5b8 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Tue, 7 Feb 2023 18:32:32 +0100
Subject: [PATCH] example/main: replace hard-coded path with variables from
 configure

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 configure                   | 13 +++++++++++++
 configure.ac                | 13 +++++++++++++
 example/main/example.xml.in | 20 ++++++++++----------
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 6e9b4bcf..0d0694cf 100755
--- a/configure
+++ b/configure
@@ -633,6 +633,9 @@ ac_ct_CXX
 CXXFLAGS
 CXX
 CPP
+LOCALSTATEDIR
+LIBDIR
+SYSCONFDIR
 MIB_GENERATED_YANG_DIR
 YANG_STANDARD_DIR
 YANG_INSTALLDIR
@@ -3419,6 +3422,7 @@ HAVE_HTTP1=false
 
 # SNMP tests require generated YANGs from MIBs
 
+# Used in expansion in, e.g., example/main/example.xml.in
 
 #
 ac_ext=c
@@ -5844,6 +5848,15 @@ fi
 
 
 
+# Expand for easy replacement in example/main/example.xml.in
+# Special case is $libdir, which is composed from $exec_prefix
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+SYSCONFDIR=`eval echo $sysconfdir`
+LIBDIR=`eval echo $libdir`
+LIBDIR=`eval echo $LIBDIR`
+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 extras/rpm/Makefile 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"
 
 cat >confcache <<\_ACEOF
diff --git a/configure.ac b/configure.ac
index 0b645cd4..337e378c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,10 @@ AC_SUBST(YANG_INSTALLDIR)
 AC_SUBST(YANG_STANDARD_DIR)
 # SNMP tests require generated YANGs from MIBs
 AC_SUBST(MIB_GENERATED_YANG_DIR)
+# Used in expansion in, e.g., example/main/example.xml.in
+AC_SUBST(SYSCONFDIR)
+AC_SUBST(LIBDIR)
+AC_SUBST(LOCALSTATEDIR)
 
 #
 AC_PROG_CC()
@@ -420,6 +424,15 @@ AC_ARG_ENABLE(nls)
 
 AH_BOTTOM([#include <clixon_custom.h>])
 
+# Expand for easy replacement in example/main/example.xml.in
+# Special case is $libdir, which is composed from $exec_prefix
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+SYSCONFDIR=`eval echo $sysconfdir`
+LIBDIR=`eval echo $libdir`
+LIBDIR=`eval echo $LIBDIR`
+LOCALSTATEDIR=`eval echo $localstatedir`
+
 AC_OUTPUT(Makefile
 	  lib/Makefile
 	  lib/src/Makefile 
diff --git a/example/main/example.xml.in b/example/main/example.xml.in
index 4cb2a3e4..c50a8975 100644
--- a/example/main/example.xml.in
+++ b/example/main/example.xml.in
@@ -1,23 +1,23 @@
 <clixon-config xmlns="http://clicon.org/config">
-  <CLICON_CONFIGFILE>/usr/local/etc/example.xml</CLICON_CONFIGFILE>
+  <CLICON_CONFIGFILE>@SYSCONFDIR@/example.xml</CLICON_CONFIGFILE>
   <CLICON_FEATURE>ietf-netconf:startup</CLICON_FEATURE>
   <CLICON_FEATURE>ietf-netconf:confirmed-commit</CLICON_FEATURE>
   <CLICON_FEATURE>clixon-restconf:allow-auth-none</CLICON_FEATURE>
   <CLICON_FEATURE>clixon-restconf:fcgi</CLICON_FEATURE>
-  <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>@YANG_INSTALLDIR@</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>@YANG_STANDARD_DIR@</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLI_MODE>example</CLICON_CLI_MODE>
-  <CLICON_BACKEND_DIR>/usr/local/lib/example/backend</CLICON_BACKEND_DIR>
-  <CLICON_NETCONF_DIR>/usr/local/lib/example/netconf</CLICON_NETCONF_DIR>
-  <CLICON_RESTCONF_DIR>/usr/local/lib/example/restconf</CLICON_RESTCONF_DIR>
-  <CLICON_CLI_DIR>/usr/local/lib/example/cli</CLICON_CLI_DIR>
-  <CLICON_CLISPEC_DIR>/usr/local/lib/example/clispec</CLICON_CLISPEC_DIR>
-  <CLICON_SOCK>/usr/local/var/example/example.sock</CLICON_SOCK>
-  <CLICON_BACKEND_PIDFILE>/usr/local/var/example/example.pidfile</CLICON_BACKEND_PIDFILE>
+  <CLICON_BACKEND_DIR>@LIBDIR@/example/backend</CLICON_BACKEND_DIR>
+  <CLICON_NETCONF_DIR>@LIBDIR@/example/netconf</CLICON_NETCONF_DIR>
+  <CLICON_RESTCONF_DIR>@LIBDIR@/example/restconf</CLICON_RESTCONF_DIR>
+  <CLICON_CLI_DIR>@LIBDIR@/example/cli</CLICON_CLI_DIR>
+  <CLICON_CLISPEC_DIR>@LIBDIR@/example/clispec</CLICON_CLISPEC_DIR>
+  <CLICON_SOCK>@LOCALSTATEDIR@/run/example.sock</CLICON_SOCK>
+  <CLICON_BACKEND_PIDFILE>@LOCALSTATEDIR@/run/example.pid</CLICON_BACKEND_PIDFILE>
   <CLICON_CLI_LINESCROLLING>0</CLICON_CLI_LINESCROLLING>
   <CLICON_CLI_TAB_MODE>0</CLICON_CLI_TAB_MODE>
-  <CLICON_XMLDB_DIR>/usr/local/var/example</CLICON_XMLDB_DIR>
+  <CLICON_XMLDB_DIR>@LOCALSTATEDIR@/lib/misc</CLICON_XMLDB_DIR>
   <CLICON_STARTUP_MODE>init</CLICON_STARTUP_MODE>
   <CLICON_NACM_MODE>disabled</CLICON_NACM_MODE>
   <CLICON_STREAM_DISCOVERY_RFC5277>true</CLICON_STREAM_DISCOVERY_RFC5277>