valadoc: Install icons and doclets to API dependent folders

This allows to co-install different valadoc versions as for the compiler.

diff --git a/configure.ac b/configure.ac
index 4dc9754507523077e7aac5023406018ed2d6816f..6de326bbb7b6e2478736114d68f07d39f2f4440c 100644 (file)
--- 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 529b9bc78600f843aa607e2501e1a7b4a979313b..8a3924b54a4de8df88eaaac4442b033253605b9d 100644 (file)
--- 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 b621d4691f71567939f88ef315f12d868b6ffa0b..791397586d05e99c2e4fed0221e1983160fc122b 100644 (file)
--- 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 ff9d87c9f6779d9aebd7f53d484860d4a66c1972..c3d6fd83c842ea676706610b766791a377e35597 100644 (file)
--- 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 b151eb37119fda93e81825fe529b8b720dcde4c6..bd9f1a167215c5e4d603885aa4ce0fd45236453d 100644 (file)
--- 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 74d3c5702c2d5fa3c81a25322da0c222268a6f30..5ac56f648ebe307f47e4ca437e01a0778db403cf 100644 (file)
--- 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 7541cc3f8ceef638c9c84e33130432a047eb9341..280f57ebf3fd22e83cf9c686274590d13a2e60ec 100644 (file)
--- 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 454bdba7c7896213deb22d93726ebcbf493d8ae6..be9d1fd8398d00cf7d7408ae55429b5f4765788f 100644 (file)
--- 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 7f14c8a7868f93aa83a7252aee3350ce56e6c7ee..13670e268a1528a7fa28873033b3090a96cf9b37 100644 (file)
--- 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/ \