As discussed on irc this moves the headers under
${prefix}/include/varnish/vmod. Tested with libvmod-curl.
f.-
bin/varnishd/Makefile.am | 4 ++--
include/Makefile.am | 4 ++--
varnishapi-uninstalled.pc.in | 1 -
varnishapi.pc.in | 3 +--
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index d9a8e62..f5d8579 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -100,8 +100,8 @@ noinst_HEADERS = \
waiter/waiter.h
# Headers for use with vmods
-pkgdataincludedir = $(pkgdatadir)/include
-nobase_pkgdatainclude_HEADERS = \
+vmodincludedir = $(pkgincludedir)/vmod
+nobase_vmodinclude_HEADERS = \
cache/cache.h \
common/common.h \
common/params.h
diff --git a/include/Makefile.am b/include/Makefile.am
index 3813836..b8deca6 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -67,8 +67,8 @@ nobase_noinst_HEADERS = \
vut_options.h
# Headers for use with vmods
-pkgdataincludedir = $(pkgdatadir)/include
-nobase_pkgdatainclude_HEADERS = \
+vmodincludedir = $(pkgincludedir)/vmod
+nobase_vmodinclude_HEADERS = \
miniobj.h \
vas.h \
vav.h \
diff --git a/varnishapi-uninstalled.pc.in b/varnishapi-uninstalled.pc.in
index 3a8f744..d252289 100644
--- a/varnishapi-uninstalled.pc.in
+++ b/varnishapi-uninstalled.pc.in
@@ -8,7 +8,6 @@ pkgincludedir=${includedir}/@PACKAGE@
datarootdir=@datarootdir@
datadir=@datadir@
pkgdatadir=${datadir}/@PACKAGE@
-pkgdataincludedir=${pkgdatadir}/include
vmoddir=${libdir}/@PACKAGE@/vmods
builddir=@abs_top_builddir@
srcdir=@abs_top_srcdir@
diff --git a/varnishapi.pc.in b/varnishapi.pc.in
index 059725e..7e7603c 100644
--- a/varnishapi.pc.in
+++ b/varnishapi.pc.in
@@ -8,8 +8,7 @@ pkgincludedir=${includedir}/@PACKAGE@
datarootdir=@datarootdir@
datadir=@datadir@
pkgdatadir=${datadir}/@PACKAGE@
-pkgdataincludedir=${pkgdatadir}/include
-vmodincludedir=${pkgdataincludedir}
+vmodincludedir=${pkgincludedir}/vmod
vmoddir=${libdir}/@PACKAGE@/vmods
vmodtool=${pkgdatadir}/vmodtool.py
_______________________________________________
varnish-dev mailing list
[email protected]
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-dev
