use sysconfdir, no need for an additional confdir variable
authorMartin Willi <martin@strongswan.org>
Mon, 7 Sep 2009 13:10:30 +0000 (15:10 +0200)
committerMartin Willi <martin@strongswan.org>
Mon, 7 Sep 2009 13:10:30 +0000 (15:10 +0200)
configure.in
src/charon/plugins/eap_sim/Makefile.am
src/charon/plugins/eap_sim_file/Makefile.am
src/charon/plugins/stroke/Makefile.am
src/openac/Makefile.am
src/pluto/Makefile.am
src/scepclient/Makefile.am
src/starter/Makefile.am

index b5d86d4..b29e29c 100644 (file)
@@ -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 =================================
index 49b72dc..dc53800 100644 (file)
@@ -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
index 1cd1dd9..67d2f41 100644 (file)
@@ -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
 
index 79a63f2..94d3116 100644 (file)
@@ -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
index b9b8648..b71e6a0 100644 (file)
@@ -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}\""
index 0e384f8..bac51e2 100644 (file)
@@ -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}\" \
index d210be4..0638069 100644 (file)
@@ -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}\" \
index a0ce6ae..7524b5f 100644 (file)
@@ -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}\" \