From faa4bd49fb7c27e05539edcb8dfe63361f49f290 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Mon, 7 Sep 2009 15:10:30 +0200
Subject: [PATCH] use sysconfdir, no need for an additional confdir variable

---
 configure.in                                | 1 -
 src/charon/plugins/eap_sim/Makefile.am      | 2 +-
 src/charon/plugins/eap_sim_file/Makefile.am | 2 +-
 src/charon/plugins/stroke/Makefile.am       | 2 +-
 src/openac/Makefile.am                      | 2 +-
 src/pluto/Makefile.am                       | 2 +-
 src/scepclient/Makefile.am                  | 2 +-
 src/starter/Makefile.am                     | 2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index b5d86d41b..b29e29cb6 100644
--- 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 49b72dc44..dc5380082 100644
--- 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 1cd1dd9e2..67d2f41f5 100644
--- 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 79a63f2c2..94d311609 100644
--- 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 b9b864838..b71e6a0e1 100644
--- 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 0e384f820..bac51e2e2 100644
--- 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 d210be483..063806916 100644
--- 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 a0ce6ae61..7524b5f26 100644
--- 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}\" \