use sysconfdir, no need for an additional confdir variable

diff --git a/configure.in b/configure.in
index b5d86d41b8c1c82057be0ce16a907fa50d9bcc20..b29e29cb6fbc2cc54e2ee941827aa16abac08c09 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,6 @@ dnl ===========================
 AC_INIT(strongSwan,4.3.5)
 AM_INIT_AUTOMAKE(tar-ustar)
 AC_CONFIG_MACRO_DIR([m4/config])
-AC_SUBST(confdir, '${sysconfdir}')
 PKG_PROG_PKG_CONFIG
 
 dnl =================================

diff --git a/src/charon/plugins/eap_sim/Makefile.am b/src/charon/plugins/eap_sim/Makefile.am
index 49b72dc44d1ffe65d3fc97efe149f8907d598595..dc53800823132393e17d8ede450997816cf244cf 100644 (file)
--- a/src/charon/plugins/eap_sim/Makefile.am
+++ b/src/charon/plugins/eap_sim/Makefile.am
@@ -2,7 +2,7 @@
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
 
 AM_CFLAGS = -rdynamic \
-       -DIPSEC_CONFDIR=\"${confdir}\" \
+       -DIPSEC_CONFDIR=\"${sysconfdir}\" \
        -DSIM_READER_LIB=\"${sim_reader}\"
 
 plugin_LTLIBRARIES = libstrongswan-eapsim.la

diff --git a/src/charon/plugins/eap_sim_file/Makefile.am b/src/charon/plugins/eap_sim_file/Makefile.am
index 1cd1dd9e27ebfa27ffde88f03b9d8a118d499ddb..67d2f41f589d7f2302c5235de21ffa5a634d332e 100644 (file)
--- a/src/charon/plugins/eap_sim_file/Makefile.am
+++ b/src/charon/plugins/eap_sim_file/Makefile.am
@@ -1,7 +1,7 @@
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
 
-AM_CFLAGS = -rdynamic -DIPSEC_CONFDIR=\"${confdir}\"
+AM_CFLAGS = -rdynamic -DIPSEC_CONFDIR=\"${sysconfdir}\"
 
 plugin_LTLIBRARIES = libstrongswan-eapsim-file.la
 

diff --git a/src/charon/plugins/stroke/Makefile.am b/src/charon/plugins/stroke/Makefile.am
index 79a63f2c239abf3a80f68edb790fde6b999a4ddb..94d3116099e9712227eb1657ecfe699ddfc8a3bc 100644 (file)
--- a/src/charon/plugins/stroke/Makefile.am
+++ b/src/charon/plugins/stroke/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon -I$(top_
 
 AM_CFLAGS = \
 -rdynamic \
--DIPSEC_CONFDIR=\"${confdir}\" \
+-DIPSEC_CONFDIR=\"${sysconfdir}\" \
 -DIPSEC_PIDDIR=\"${piddir}\"
 
 plugin_LTLIBRARIES = libstrongswan-stroke.la

diff --git a/src/openac/Makefile.am b/src/openac/Makefile.am
index b9b8648382aaca0b5079c49a2099c90c026432fa..b71e6a0e1fe03ccfabcd103fdb8b107ee208d0b2 100644 (file)
--- a/src/openac/Makefile.am
+++ b/src/openac/Makefile.am
@@ -4,7 +4,7 @@ dist_man_MANS = openac.8
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = \
-  -DIPSEC_CONFDIR=\"${confdir}\" \
+  -DIPSEC_CONFDIR=\"${sysconfdir}\" \
   -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
   -DIPSEC_PLUGINDIR=\"${plugindir}\" \
   -DPLUGINS=\""${libstrongswan_plugins}\""

diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 0e384f82006606700fa1d8b27ef7360bcac0f7b5..bac51e2e2a360c19adecc557a21da7188b3db534 100644 (file)
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -65,7 +65,7 @@ INCLUDES = \
 
 AM_CFLAGS = \
 -DIPSEC_DIR=\"${ipsecdir}\" \
--DIPSEC_CONFDIR=\"${confdir}\" \
+-DIPSEC_CONFDIR=\"${sysconfdir}\" \
 -DIPSEC_PIDDIR=\"${piddir}\" \
 -DSHARED_SECRETS_FILE=\"${confdir}/ipsec.secrets\" \
 -DIPSEC_PLUGINDIR=\"${plugindir}\" \

diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index d210be48379c18f978bce11c0b13ee12dec54fe5..063806916f909a9df766b5979b8abdc2ea4758f5 100644 (file)
--- a/src/scepclient/Makefile.am
+++ b/src/scepclient/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = \
 -I$(WHACKDIR)
 
 AM_CFLAGS = \
--DIPSEC_CONFDIR=\"${confdir}\" \
+-DIPSEC_CONFDIR=\"${sysconfdir}\" \
 -DIPSEC_PLUGINDIR=\"${plugindir}\" \
 -DPLUGINS=\""${pluto_plugins}\"" \
 -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \

diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index a0ce6ae61c8690f2af0005eb77fd67f425ba4ea3..7524b5f2658af43cf2e33e9d0b37368069ec7f5f 100644 (file)
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
 
 AM_CFLAGS = \
 -DIPSEC_DIR=\"${ipsecdir}\" \
--DIPSEC_CONFDIR=\"${confdir}\" \
+-DIPSEC_CONFDIR=\"${sysconfdir}\" \
 -DIPSEC_PIDDIR=\"${piddir}\" \
 -DIPSEC_EAPDIR=\"${eapdir}\" \
 -DDEV_RANDOM=\"${random_device}\" \