[master] 5c8b790 Feed automake a pkgdatadir

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Fri Mar 10 20:15:06 CET 2017


commit 5c8b790fb18130dcdb532913d34bf2343d43ed1b
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Mar 10 20:13:03 2017 +0100

    Feed automake a pkgdatadir
    
    While at it, get rid of the hard-coded package name.
    
    Refs #2251

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index b07e9f0..fabcff8 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -140,13 +140,15 @@ nobase_pkginclude_HEADERS = \
 	common/com_params.h \
 	waiter/waiter.h
 
+pkgdatadir = ${datarootdir}/${PACKAGE}/vcl
+
 varnishd_CFLAGS = \
 	@PCRE_CFLAGS@ \
 	@SAN_CFLAGS@ \
 	-DVARNISHD_IS_NOT_A_VMOD \
 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
 	-DVARNISH_VMOD_DIR='"${pkglibdir}/vmods"' \
-	-DVARNISH_VCL_DIR='"${varnishconfdir}:${datarootdir}/varnish/vcl"'
+	-DVARNISH_VCL_DIR='"${varnishconfdir}:${pkgdatadir}"'
 
 varnishd_LDFLAGS = -export-dynamic
 



More information about the varnish-commit mailing list