[master] 8fc0ae6 Make vcldir downstream-friendly in etc/Makefile.am

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Feb 27 18:22:13 UTC 2018


commit 8fc0ae67cccb4ed5e3cfc621bf97cd09aae2e8e7
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Feb 27 19:15:12 2018 +0100

    Make vcldir downstream-friendly in etc/Makefile.am
    
    And sync bin/varnishd/Makefile.am to use the same (and more accurate)
    variable name.
    
    Spotted by Reza.

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 890428a..66907db 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -145,14 +145,14 @@ nobase_pkginclude_HEADERS = \
 	cache/cache_filter.h \
 	waiter/waiter.h
 
-pkgdatadir = ${datarootdir}/${PACKAGE}/vcl
+vcldir=$(datarootdir)/$(PACKAGE)/vcl
 
 varnishd_CFLAGS = \
 	@PCRE_CFLAGS@ \
 	@SAN_CFLAGS@ \
 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
 	-DVARNISH_VMOD_DIR='"${pkglibdir}/vmods"' \
-	-DVARNISH_VCL_DIR='"${pkgsysconfdir}:${pkgdatadir}"'
+	-DVARNISH_VCL_DIR='"${pkgsysconfdir}:${vcldir}"'
 
 varnishd_LDFLAGS = -export-dynamic
 
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 8fc49b9..8cd999c 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -11,6 +11,6 @@ New users is recommended to use the example.vcl file as a starting point.\n\n";\
 	sed -n '/vcl_recv/,$$p' $(top_srcdir)/bin/varnishd/builtin.vcl ) | \
 	sed 's/^\(.*\)$$/# \1/' > builtin.vcl
 
-vcldir=$(datarootdir)/varnish/vcl
+vcldir=$(datarootdir)/$(PACKAGE)/vcl
 
 dist_vcl_DATA = devicedetect.vcl


More information about the varnish-commit mailing list