build: Use dedicated PACKAGE_VALADOC_* defines

diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
index 619e63e49bab1d64630a9c794a2605988f41666f..1602a0ccac285d193dd28b19efd1e9af14334949 100644 (file)
--- a/libvaladoc/Makefile.am
+++ b/libvaladoc/Makefile.am
@@ -3,8 +3,7 @@ include $(top_srcdir)/Makefile.common
 NULL =
 
 AM_CFLAGS = \
-       -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-       -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
+       -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \
        -DPACKAGE_VERSION=\"$(VERSION)\" \
        $(COVERAGE_CFLAGS) \
        $(LIBGVC_CFLAGS) \

diff --git a/libvaladoc/filehelper.vala b/libvaladoc/filehelper.vala
index 46823bb04c1f48b95fa56fc7e74f1a698f6c4cba..3d0272272ebfa166c15aba36aeeac14e6316e781 100644 (file)
--- a/libvaladoc/filehelper.vala
+++ b/libvaladoc/filehelper.vala
@@ -22,9 +22,6 @@
 
 
 namespace Valadoc {
-       [CCode (cprefix = "", cname = "PACKAGE_ICONDIR")]
-       public extern const string icons_dir;
-
        /**
         * Makes a copy of the file src to dest.
         *

diff --git a/libvaladoc/moduleloader.vala b/libvaladoc/moduleloader.vala
index d73adda7492774ece97db801e84c73ec18890092..d1631e7ec59ac8346487066b228199ae7861143f 100644 (file)
--- a/libvaladoc/moduleloader.vala
+++ b/libvaladoc/moduleloader.vala
@@ -64,7 +64,7 @@ public class Valadoc.ModuleLoader : Object {
                        if (is_doclet(local_path)) {
                                return local_path;
                        } else {
-                               return Path.build_filename (Config.PACKAGE_DATADIR, pluginsubdir, pluginpath);
+                               return Path.build_filename (Config.PACKAGE_VALADOC_LIBDIR, pluginsubdir, pluginpath);
                        }
                }
 
@@ -73,7 +73,7 @@ public class Valadoc.ModuleLoader : Object {
 
        public static string get_doclet_path (string? docletpath, ErrorReporter reporter) {
                if (docletpath == null) {
-                       return Path.build_filename (Config.PACKAGE_DATADIR, "doclets", "html");
+                       return Path.build_filename (Config.PACKAGE_VALADOC_LIBDIR, "doclets", "html");
                }
 
                return get_plugin_path (docletpath, "doclets");

diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am
index 33f3a9375e78010bc44a74d915a7f22b7e83614e..b7fb50986c6d2cf166d4a742ca5880f1ab2e910c 100644 (file)
--- a/valadoc/Makefile.am
+++ b/valadoc/Makefile.am
@@ -9,7 +9,7 @@ SUBDIRS = \
        $(NULL)
 
 AM_CFLAGS = \
-       -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
+       -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \
        -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 5783c0b5af0b049f702fff577c28c25db8bd7778..c8bb6b16ed6bfaa264339b0a1b9f5da585a5a13c 100644 (file)
--- a/valadoc/doclets/devhelp/Makefile.am
+++ b/valadoc/doclets/devhelp/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.common
 NULL =
 
 AM_CFLAGS = \
-       -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+       -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \
        -I$(top_srcdir)/gee/ \
        -I$(top_srcdir)/vala/ \
        -I$(top_srcdir)/libvaladoc/ \
@@ -35,7 +35,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
                $(VALAFLAGS) \
                -C \
                --vapidir $(top_srcdir)/vala --pkg libvala@PACKAGE_SUFFIX@ \
-               --vapidir $(top_srcdir)/vapi \
+               --vapidir $(top_srcdir)/vapi --pkg config \
                --vapidir $(top_srcdir)/libvaladoc --pkg valadoc@PACKAGE_SUFFIX@ \
                $(filter %.vala %.c,$^)
        touch $@

diff --git a/valadoc/doclets/devhelp/doclet.vala b/valadoc/doclets/devhelp/doclet.vala
index a166cc1eb6384a5df1c84166433556f89cd0bd81..bb53a1ff3538dbccc4b73c8700b4f851d465393b 100644 (file)
--- a/valadoc/doclets/devhelp/doclet.vala
+++ b/valadoc/doclets/devhelp/doclet.vala
@@ -82,7 +82,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
 
                var rt = DirUtils.create (path, 0777);
                rt = DirUtils.create (imgpath, 0777);
-               copy_directory (icons_dir, path);
+               copy_directory (Config.PACKAGE_VALADOC_ICONDIR, path);
 
                var devfile = FileStream.open (devpath, "w");
                _devhelpwriter = new Devhelp.MarkupWriter (devfile);

diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am
index 763e46932fc05f1d983ac6ad2c040bedadd59af6..98764d7bdb85c0c6552248387fbf612bd097f45a 100644 (file)
--- a/valadoc/doclets/gtkdoc/Makefile.am
+++ b/valadoc/doclets/gtkdoc/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.common
 NULL =
 
 AM_CFLAGS = \
-       -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+       -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \
        -I$(top_srcdir)/gee/ \
        -I$(top_srcdir)/vala/ \
        -I$(top_srcdir)/libvaladoc/ \

diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am
index 885fbfbabf0eba1548e816e4e0cc403b942131a5..900a014d45a0e17cb5a0e8291392047dc50fd2d7 100644 (file)
--- a/valadoc/doclets/html/Makefile.am
+++ b/valadoc/doclets/html/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.common
 NULL =
 
 AM_CFLAGS = \
-       -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+       -DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \
        -I$(top_srcdir)/gee/ \
        -I$(top_srcdir)/vala/ \
        -I$(top_srcdir)/libvaladoc/ \
@@ -35,7 +35,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
                $(VALAFLAGS) \
                -C \
                --vapidir $(top_srcdir)/vala --pkg libvala@PACKAGE_SUFFIX@ \
-               --vapidir $(top_srcdir)/vapi \
+               --vapidir $(top_srcdir)/vapi --pkg config \
                --vapidir $(top_srcdir)/libvaladoc --pkg valadoc@PACKAGE_SUFFIX@ \
                $(filter %.vala %.c,$^)
        touch $@

diff --git a/valadoc/doclets/html/doclet.vala b/valadoc/doclets/html/doclet.vala
index 1bb21e94d71ffc817a51abac29ba414cb9f923cc..9cb23cd17e544cf605952f421abd6d2ef195f60f 100644 (file)
--- a/valadoc/doclets/html/doclet.vala
+++ b/valadoc/doclets/html/doclet.vala
@@ -73,7 +73,7 @@ public class Valadoc.Html.Doclet : Valadoc.Html.BasicDoclet {
                base.process (settings, tree, reporter);
 
                DirUtils.create_with_parents (this.settings.path, 0777);
-               copy_directory (icons_dir, settings.path);
+               copy_directory (Config.PACKAGE_VALADOC_ICONDIR, settings.path);
 
                write_wiki_pages (tree, css_path_wiki, js_path_wiki, Path.build_filename(settings.path, settings.pkg_name));
 

diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am
index e1fda6383fa6145b9f18836faea4d453e87e2bd4..b49de43cb38f0f4865d93303faddfb2e754b02bb 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_DATADIR=\"$(libdir)/valadoc\" \
+       -DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \
        -DPACKAGE_VERSION=\"$(VERSION)\" \
        -DTOP_SRC_DIR=\"$(abs_top_srcdir)\" \
        -I$(top_srcdir)/libvaladoc/ \

diff --git a/vapi/config.vapi b/vapi/config.vapi
index 543a92fa8a078b2cacbdf15ad9390d7c7a4b6b52..c8b5d58a1aea0387371c8baa1fe6f025810b863f 100644 (file)
--- a/vapi/config.vapi
+++ b/vapi/config.vapi
@@ -24,4 +24,6 @@
 namespace Config {
        public const string PACKAGE_DATADIR;
        public const string PACKAGE_SUFFIX;
+       public const string PACKAGE_VALADOC_LIBDIR;
+       public const string PACKAGE_VALADOC_ICONDIR;
 }