summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libvaladoc/Makefile.am3
-rw-r--r--libvaladoc/filehelper.vala3
-rw-r--r--libvaladoc/moduleloader.vala4
-rw-r--r--valadoc/Makefile.am2
-rw-r--r--valadoc/doclets/devhelp/Makefile.am4
-rw-r--r--valadoc/doclets/devhelp/doclet.vala2
-rw-r--r--valadoc/doclets/gtkdoc/Makefile.am2
-rw-r--r--valadoc/doclets/html/Makefile.am4
-rw-r--r--valadoc/doclets/html/doclet.vala2
-rw-r--r--valadoc/tests/Makefile.am2
-rw-r--r--vapi/config.vapi2
11 files changed, 14 insertions, 16 deletions
diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
index 619e63e49..1602a0cca 100644
--- 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 46823bb04..3d0272272 100644
--- 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 d73adda74..d1631e7ec 100644
--- 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 33f3a9375..b7fb50986 100644
--- 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 5783c0b5a..c8bb6b16e 100644
--- 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 a166cc1eb..bb53a1ff3 100644
--- 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 763e46932..98764d7bd 100644
--- 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 885fbfbab..900a014d4 100644
--- 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 1bb21e94d..9cb23cd17 100644
--- 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 e1fda6383..b49de43cb 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_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 543a92fa8..c8b5d58a1 100644
--- 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;
}
View Lorry Controller Status