[vala/staging] valadoc: Install icons and doclets to API dependent folders

[Rico Tzschichholz <ricotz src gnome org>]

commit da7085811b75f589619e2e349ba5b4d2e2bd2b38
Author: Mart Raudsepp <leio gentoo org>
Date:   Sat Jul 27 20:20:45 2019 +0300

    valadoc: Install icons and doclets to API dependent folders
    
    This allows to co-install different valadoc versions as for the compiler.

 configure.ac                        | 2 ++
 libvaladoc/Makefile.am              | 2 +-
 libvaladoc/valadoc.pc.in            | 2 ++
 valadoc/Makefile.am                 | 2 +-
 valadoc/doclets/devhelp/Makefile.am | 4 ++--
 valadoc/doclets/gtkdoc/Makefile.am  | 4 ++--
 valadoc/doclets/html/Makefile.am    | 4 ++--
 valadoc/icons/Makefile.am           | 2 +-
 valadoc/tests/Makefile.am           | 2 +-
 9 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4dc975450..6de326bbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,8 @@ program_transform_name="s,\$\$,${PACKAGE_SUFFIX},"
 
 AC_SUBST(pkgdatadir, [${datadir}/vala${PACKAGE_SUFFIX}])
 AC_SUBST(pkglibdir, [${libdir}/vala${PACKAGE_SUFFIX}])
+AC_SUBST(pkgdocdatadir, [${datadir}/valadoc${PACKAGE_SUFFIX}])
+AC_SUBST(pkgdoclibdir, [${libdir}/valadoc${PACKAGE_SUFFIX}])
 
 # Checks for programs.
 AC_PROG_CC
diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
index 529b9bc78..8a3924b54 100644
--- a/libvaladoc/Makefile.am
+++ b/libvaladoc/Makefile.am
@@ -4,7 +4,7 @@ NULL =
 
 AM_CFLAGS = \
        -DG_LOG_DOMAIN=\"valadoc\" \
-       -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \
+       -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\" \
        -DPACKAGE_VERSION=\"$(VERSION)\" \
        $(COVERAGE_CFLAGS) \
        $(LIBGVC_CFLAGS) \
diff --git a/libvaladoc/valadoc.pc.in b/libvaladoc/valadoc.pc.in
index b621d4691..791397586 100644
--- a/libvaladoc/valadoc.pc.in
+++ b/libvaladoc/valadoc.pc.in
@@ -4,6 +4,8 @@ libdir=@libdir@
 includedir=@includedir@
 datarootdir=@datarootdir@
 datadir=@datadir@
+pkgdatadir=@pkgdocdatadir@
+pkglibdir=@pkgdoclibdir@
 vapidir=@datadir@/vala/vapi
 
 Name: Valadoc
diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am
index ff9d87c9f..c3d6fd83c 100644
--- a/valadoc/Makefile.am
+++ b/valadoc/Makefile.am
@@ -10,7 +10,7 @@ SUBDIRS = \
 
 AM_CFLAGS = \
        -DG_LOG_DOMAIN=\"valadoc\" \
-       -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \
+       -DPACKAGE_VALADOC_LIBDIR=\"$(pkgdoclibdir)\" \
        -DPACKAGE_VERSION=\"$(VERSION)\" \
        -I$(top_srcdir)/libvaladoc/ \
        -I$(top_srcdir)/gee \
diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am
index b151eb371..bd9f1a167 100644
--- a/valadoc/doclets/devhelp/Makefile.am
+++ b/valadoc/doclets/devhelp/Makefile.am
@@ -4,7 +4,7 @@ NULL =
 
 AM_CFLAGS = \
        -DG_LOG_DOMAIN=\"valadoc-devhelp\" \
-       -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+       -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \
        -I$(top_srcdir)/gee/ \
        -I$(top_srcdir)/vala/ \
        -I$(top_srcdir)/libvaladoc/ \
@@ -17,7 +17,7 @@ BUILT_SOURCES = libdoclet.vala.stamp
 
 doclet_LTLIBRARIES = libdoclet.la
 
-docletdir = $(libdir)/valadoc/doclets/devhelp
+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/devhelp
 
 libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
 
diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am
index 74d3c5702..5ac56f648 100644
--- a/valadoc/doclets/gtkdoc/Makefile.am
+++ b/valadoc/doclets/gtkdoc/Makefile.am
@@ -4,7 +4,7 @@ NULL =
 
 AM_CFLAGS = \
        -DG_LOG_DOMAIN=\"valadoc-gtkdoc\" \
-       -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+       -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \
        -I$(top_srcdir)/gee/ \
        -I$(top_srcdir)/vala/ \
        -I$(top_srcdir)/libvaladoc/ \
@@ -17,7 +17,7 @@ BUILT_SOURCES = libdoclet.vala.stamp
 
 doclet_LTLIBRARIES = libdoclet.la
 
-docletdir = $(libdir)/valadoc/doclets/gtkdoc
+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/gtkdoc
 
 libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
 
diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am
index 7541cc3f8..280f57ebf 100644
--- a/valadoc/doclets/html/Makefile.am
+++ b/valadoc/doclets/html/Makefile.am
@@ -4,7 +4,7 @@ NULL =
 
 AM_CFLAGS = \
        -DG_LOG_DOMAIN=\"valadoc-html\" \
-       -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+       -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \
        -I$(top_srcdir)/gee/ \
        -I$(top_srcdir)/vala/ \
        -I$(top_srcdir)/libvaladoc/ \
@@ -17,7 +17,7 @@ BUILT_SOURCES = libdoclet.vala.stamp
 
 doclet_LTLIBRARIES = libdoclet.la
 
-docletdir = $(libdir)/valadoc/doclets/html
+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/html
 
 libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
 
diff --git a/valadoc/icons/Makefile.am b/valadoc/icons/Makefile.am
index 454bdba7c..be9d1fd83 100644
--- a/valadoc/icons/Makefile.am
+++ b/valadoc/icons/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-iconsdir = $(datadir)/valadoc/icons
+iconsdir = $(datadir)/valadoc@PACKAGE_SUFFIX@/icons
 
 dist_icons_DATA = \
        abstractclass.png \
diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am
index 7f14c8a78..13670e268 100644
--- a/valadoc/tests/Makefile.am
+++ b/valadoc/tests/Makefile.am
@@ -22,7 +22,7 @@ check-TESTS: $(TESTS)
        G_DEBUG=fatal_warnings $(builddir)/driver
 
 AM_CFLAGS = \
-       -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \
+       -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\" \
        -DPACKAGE_VERSION=\"$(VERSION)\" \
        -DTOP_SRC_DIR=\"$(abs_top_srcdir)\" \
        -I$(top_srcdir)/libvaladoc/ \