[5055] Use pkgincludedir in several Makefile.am.

diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index 76c534fabbcabf5a980ec79639eb5db5192e716a..f21d2c3d0474a22b60cf96b0f5105da34f9ffb35 100644 (file)
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -176,7 +176,7 @@ s-rdatacode: Makefile $(EXTRA_DIST)
 
 #rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc: s-rdatacode
 
-libdns___includedir = $(includedir)/$(PACKAGE_NAME)/dns
+libdns___includedir = $(pkgincludedir)/dns
 libdns___include_HEADERS = \
        edns.h \
        exceptions.h \

diff --git a/src/lib/exceptions/Makefile.am b/src/lib/exceptions/Makefile.am
index bf44ea7e5eb10526eb84de1dcc5da12ca105dbbc..93abc44567a2152ab709e705dc3235bfa26467a9 100644 (file)
--- a/src/lib/exceptions/Makefile.am
+++ b/src/lib/exceptions/Makefile.am
@@ -8,5 +8,5 @@ libkea_exceptions_la_SOURCES = exceptions.h exceptions.cc
 
 CLEANFILES = *.gcno *.gcda
 
-libkea_exceptions_includedir = $(includedir)/$(PACKAGE_NAME)/exceptions
+libkea_exceptions_includedir = $(pkgincludedir)/exceptions
 libkea_exceptions_include_HEADERS = exceptions.h

diff --git a/src/lib/stats/Makefile.am b/src/lib/stats/Makefile.am
index 8b2deccb88711fb3bde0e197bed684715a995c81..e3c14f0013d8995c497210084ef6af74b43e2fb8 100644 (file)
--- a/src/lib/stats/Makefile.am
+++ b/src/lib/stats/Makefile.am
@@ -16,5 +16,5 @@ libkea_stats_la_LIBADD  = $(top_builddir)/src/lib/cc/libkea-cc.la
 libkea_stats_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_stats_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
-libkea_stats_includedir = $(includedir)/$(PACKAGE_NAME)/stats
+libkea_stats_includedir = $(pkgincludedir)/stats
 libkea_stats_include_HEADERS = stats_mgr.h

diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index c9545e5d5180362e4e7c678967745fbdde9f2874..2f2b5350b4c1560840f2cd7450d3a7f181d69bab 100644 (file)
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -41,7 +41,7 @@ libkea_util_la_LDFLAGS  = -no-undefined -version-info 2:0:0
 
 CLEANFILES = *.gcno *.gcda
 
-libkea_util_includedir = $(includedir)/$(PACKAGE_NAME)/util
+libkea_util_includedir = $(pkgincludedir)/util
 libkea_util_include_HEADERS = \
     buffer.h \
     io_utilities.h \