[4.0] de40d3e Install _all_ headers under ${prefix}/include/..

[Lasse Karstensen]

commit de40d3ee2a2f1e6eff33aa9d56e718aaa149f702
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sat Nov 8 01:47:26 2014 +0000

    Install _all_ headers under ${prefix}/include/..
    
    Fixes #1616
    
    Conflicts:
    	bin/varnishd/Makefile.am
    	varnish.m4

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 402cd0d..8cf16de 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -87,10 +87,9 @@ varnishd_SOURCES = \
 	waiter/cache_waiter_ports.c 
 
 noinst_HEADERS = \
-	cache/cache_backend.h \
+	builtin_vcl.h \
 	cache/cache_esi.h \
 	common/heritage.h \
-	builtin_vcl.h \
 	hash/hash_slinger.h \
 	mgt/mgt.h \
 	mgt/mgt_cli.h \
@@ -100,8 +99,7 @@ noinst_HEADERS = \
 	waiter/waiter.h
 
 # Headers for use with vmods
-pkgdataincludedir = $(pkgdatadir)/include
-nobase_pkgdatainclude_HEADERS = \
+nobase_pkginclude_HEADERS = \
 	cache/cache.h \
 	cache/cache_backend.h \
 	common/common.h \
diff --git a/include/Makefile.am b/include/Makefile.am
index 96d9663..b7487d6 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -37,6 +37,24 @@ nobase_pkginclude_HEADERS = \
 	vapi/vapi_options.h \
 	vcli.h
 
+# Headers for use with vmods
+nobase_pkginclude_HEADERS += \
+	miniobj.h \
+	vas.h \
+	vav.h \
+	vbm.h \
+	vcl.h \
+	vcs.h \
+	vmod_abi.h \
+	vqueue.h \
+	vre.h \
+	vdef.h \
+	vrt.h \
+	vrt_obj.h \
+	vsa.h \
+	vsb.h \
+	vsha256.h
+
 # Private headers
 nobase_noinst_HEADERS = \
 	binary_heap.h \
@@ -68,25 +86,6 @@ nobase_noinst_HEADERS = \
 	vut.h \
 	vut_options.h
 
-# Headers for use with vmods
-pkgdataincludedir = $(pkgdatadir)/include
-nobase_pkgdatainclude_HEADERS = \
-	miniobj.h \
-	vas.h \
-	vav.h \
-	vbm.h \
-	vcl.h \
-	vcs.h \
-	vmod_abi.h \
-	vqueue.h \
-	vre.h \
-	vdef.h \
-	vrt.h \
-	vrt_obj.h \
-	vsa.h \
-	vsb.h \
-	vsha256.h
-
 tbl/vrt_stv_var.h tbl/vcl_returns.h tbl/vcc_types.h vcl.h vrt_obj.h: $(top_srcdir)/lib/libvcc/generate.py $(top_srcdir)/include/vrt.h
 	mkdir -p tbl
 	@PYTHON@ $(top_srcdir)/lib/libvcc/generate.py $(top_srcdir) $(top_builddir)
diff --git a/varnish.m4 b/varnish.m4
index f4e9e9c..8339cb0 100644
--- a/varnish.m4
+++ b/varnish.m4
@@ -58,10 +58,9 @@ variable if you installed software in a non-standard prefix.])
 	fi
 ])
 
-VARNISH_PKG_GET_VAR([VMOD_INCLUDE_DIR], [vmodincludedir])
 VARNISH_PKG_GET_VAR([VAPI_INCLUDE_DIR], [pkgincludedir])
 _CPPFLAGS="$CPPFLAGS"
-VMOD_INCLUDES="-I$VMOD_INCLUDE_DIR -I$VAPI_INCLUDE_DIR"
+VMOD_INCLUDES="-I$VAPI_INCLUDE_DIR"
 CPPFLAGS="$VMOD_INCLUDES $CPPFLAGS"
 AC_CHECK_HEADERS([vsha256.h cache/cache.h])
 CPPFLAGS="$_CPPFLAGS"
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..b2a6e93 100644
--- a/varnishapi.pc.in
+++ b/varnishapi.pc.in
@@ -8,8 +8,6 @@ pkgincludedir=${includedir}/@PACKAGE@
 datarootdir=@datarootdir@
 datadir=@datadir@
 pkgdatadir=${datadir}/@PACKAGE@
-pkgdataincludedir=${pkgdatadir}/include
-vmodincludedir=${pkgdataincludedir}
 vmoddir=${libdir}/@PACKAGE@/vmods
 vmodtool=${pkgdatadir}/vmodtool.py