[master] f62e60d Polish: s/varnishconfdir/pkgsysconfdir/
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Wed Mar 15 13:55:07 CET 2017
commit f62e60dc8c2eeeff6e2aea6a5638a3265bc52ecf
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Sat Mar 11 10:29:40 2017 +0100
Polish: s/varnishconfdir/pkgsysconfdir/
For consistency.
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index fabcff8..1034c51 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -148,7 +148,7 @@ varnishd_CFLAGS = \
-DVARNISHD_IS_NOT_A_VMOD \
-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
-DVARNISH_VMOD_DIR='"${pkglibdir}/vmods"' \
- -DVARNISH_VCL_DIR='"${varnishconfdir}:${pkgdatadir}"'
+ -DVARNISH_VCL_DIR='"${pkgsysconfdir}:${pkgdatadir}"'
varnishd_LDFLAGS = -export-dynamic
diff --git a/configure.ac b/configure.ac
index a85b19a..5ea261e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -505,8 +505,8 @@ VARNISH_STATE_DIR='${localstatedir}/varnish'
AC_SUBST(VARNISH_STATE_DIR)
# Default configuration directory.
-varnishconfdir='${sysconfdir}/varnish'
-AC_SUBST(varnishconfdir)
+pkgsysconfdir='${sysconfdir}/varnish'
+AC_SUBST(pkgsysconfdir)
# Check for linker script support
gl_LD_VERSION_SCRIPT
More information about the varnish-commit
mailing list