[master] 4a3e805fc Define $(vmoddir) in a single location

[Dridi Boukelmoune]

commit 4a3e805fca019d4c3acde0fdf97231ffcb957557
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Apr 14 23:11:24 2020 +0200

    Define $(vmoddir) in a single location
    
    Trimming more of the automake_boilerplate.am fat that prevents using
    $(vmodtool) --boilerplate out of tree.

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index e124ed5d8..74974525b 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -163,7 +163,7 @@ varnishd_CFLAGS = \
 	@SAN_CFLAGS@ \
 	-DNOT_IN_A_VMOD \
 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
-	-DVARNISH_VMOD_DIR='"${pkglibdir}/vmods"' \
+	-DVARNISH_VMOD_DIR='"${vmoddir}"' \
 	-DVARNISH_VCL_DIR='"${pkgsysconfdir}:${vcldir}"'
 
 varnishd_LDFLAGS = -export-dynamic
diff --git a/configure.ac b/configure.ac
index 7c63ce667..cbdeb59cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -665,6 +665,9 @@ AC_SUBST(VARNISH_STATE_DIR)
 pkgsysconfdir='${sysconfdir}/varnish'
 AC_SUBST(pkgsysconfdir)
 
+# VMODs directory
+AC_SUBST(vmoddir, [$\(pkglibdir\)/vmods])
+
 # Check for linker script support
 gl_LD_VERSION_SCRIPT
 
diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 6fd1843ea..8aff20188 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -56,7 +56,6 @@ AM_CPPFLAGS = \\
 \t-I$(top_srcdir)/bin/varnishd \\
 \t-I$(top_builddir)/include
 
-vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
 vmodtoolargs ?= --strict --boilerplate -o PFX
 
diff --git a/lib/libvmod_blob/automake_boilerplate.am b/lib/libvmod_blob/automake_boilerplate.am
index 3b0125e55..0314308ff 100644
--- a/lib/libvmod_blob/automake_boilerplate.am
+++ b/lib/libvmod_blob/automake_boilerplate.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
 vmodtoolargs ?= --strict --boilerplate -o vcc_if
 
diff --git a/lib/libvmod_cookie/automake_boilerplate.am b/lib/libvmod_cookie/automake_boilerplate.am
index 6c85b1ac4..d9742e7c9 100644
--- a/lib/libvmod_cookie/automake_boilerplate.am
+++ b/lib/libvmod_cookie/automake_boilerplate.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
 vmodtoolargs ?= --strict --boilerplate -o vcc_if
 
diff --git a/lib/libvmod_debug/automake_boilerplate.am b/lib/libvmod_debug/automake_boilerplate.am
index 9b92b78cf..407d5c1ab 100644
--- a/lib/libvmod_debug/automake_boilerplate.am
+++ b/lib/libvmod_debug/automake_boilerplate.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
 vmodtoolargs ?= --strict --boilerplate -o vcc_if
 
diff --git a/lib/libvmod_directors/automake_boilerplate.am b/lib/libvmod_directors/automake_boilerplate.am
index 24012dcf8..1849ef3c2 100644
--- a/lib/libvmod_directors/automake_boilerplate.am
+++ b/lib/libvmod_directors/automake_boilerplate.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
 vmodtoolargs ?= --strict --boilerplate -o vcc_if
 
diff --git a/lib/libvmod_proxy/automake_boilerplate.am b/lib/libvmod_proxy/automake_boilerplate.am
index db74debe4..09c793bc8 100644
--- a/lib/libvmod_proxy/automake_boilerplate.am
+++ b/lib/libvmod_proxy/automake_boilerplate.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
 vmodtoolargs ?= --strict --boilerplate -o vcc_if
 
diff --git a/lib/libvmod_purge/automake_boilerplate.am b/lib/libvmod_purge/automake_boilerplate.am
index a3eace00b..25132b54b 100644
--- a/lib/libvmod_purge/automake_boilerplate.am
+++ b/lib/libvmod_purge/automake_boilerplate.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
 vmodtoolargs ?= --strict --boilerplate -o vcc_if
 
diff --git a/lib/libvmod_std/automake_boilerplate.am b/lib/libvmod_std/automake_boilerplate.am
index 947b142dd..7a82bd382 100644
--- a/lib/libvmod_std/automake_boilerplate.am
+++ b/lib/libvmod_std/automake_boilerplate.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
 vmodtoolargs ?= --strict --boilerplate -o vcc_if
 
diff --git a/lib/libvmod_unix/automake_boilerplate.am b/lib/libvmod_unix/automake_boilerplate.am
index 405b2a8ea..7a4d0c598 100644
--- a/lib/libvmod_unix/automake_boilerplate.am
+++ b/lib/libvmod_unix/automake_boilerplate.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
 vmodtoolargs ?= --strict --boilerplate -o vcc_if
 
diff --git a/lib/libvmod_vtc/automake_boilerplate.am b/lib/libvmod_vtc/automake_boilerplate.am
index 1494b3e67..d01e912ea 100644
--- a/lib/libvmod_vtc/automake_boilerplate.am
+++ b/lib/libvmod_vtc/automake_boilerplate.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/bin/varnishd \
 	-I$(top_builddir)/include
 
-vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
 vmodtoolargs ?= --strict --boilerplate -o vcc_if