[master] cfbe88a10 fix vmodtool boilerplate for -o

Nils Goroll nils.goroll at uplex.de
Thu Feb 21 16:04:08 UTC 2019


commit cfbe88a10c3f92bb26c2d688b10ae1a228e9db7a
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Feb 21 17:01:11 2019 +0100

    fix vmodtool boilerplate for -o
    
    Fixes #2914

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index bbde1ca98..6cf6fdfaa 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -71,18 +71,18 @@ libvmod_XXX_la_LDFLAGS = \\
 \t$(VMOD_LDFLAGS) \\
 \t at SAN_LDFLAGS@
 
-nodist_libvmod_XXX_la_SOURCES = vcc_if.c vcc_if.h
+nodist_libvmod_XXX_la_SOURCES = PFX.c PFX.h
 
-$(libvmod_XXX_la_OBJECTS): vcc_if.h
+$(libvmod_XXX_la_OBJECTS): PFX.h
 
-vcc_if.h vmod_XXX.rst vmod_XXX.man.rst: vcc_if.c
+PFX.h vmod_XXX.rst vmod_XXX.man.rst: PFX.c
 
-vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
+PFX.c: $(vmodtool) $(srcdir)/vmod.vcc
 \t at PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
 EXTRA_DIST = vmod.vcc automake_boilerplate.am
 
-CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \\
+CLEANFILES = $(builddir)/PFX.c $(builddir)/PFX.h \\
 \t$(builddir)/vmod_XXX.rst \\
 \t$(builddir)/vmod_XXX.man.rst
 
@@ -952,7 +952,8 @@ class vcc(object):
     def amboilerplate(self):
         ''' Produce boilplate for autocrap tools '''
         fo = self.openfile("automake_boilerplate.am")
-        fo.write(AMBOILERPLATE.replace("XXX", self.modname))
+        fo.write(AMBOILERPLATE.replace("XXX", self.modname)
+                 .replace("PFX", self.pfx))
         fo.close()
 
     def mkdefs(self, fo):


More information about the varnish-commit mailing list