diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-11-25 16:01:29 +0100 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-11-25 16:03:31 +0100 |
commit | 5211ef746795e4656fa16b2806b82096e3eeab27 (patch) | |
tree | 2eb85b35113e76c455c4c9df82b389bfc078cc89 /valadoc | |
parent | a3298c07befd2ba6ef1e7c088787559f00a79a48 (diff) | |
download | vala-5211ef746795e4656fa16b2806b82096e3eeab27.tar.gz |
build: Use dedicated PACKAGE_VALADOC_* defines
Diffstat (limited to 'valadoc')
-rw-r--r-- | valadoc/Makefile.am | 2 | ||||
-rw-r--r-- | valadoc/doclets/devhelp/Makefile.am | 4 | ||||
-rw-r--r-- | valadoc/doclets/devhelp/doclet.vala | 2 | ||||
-rw-r--r-- | valadoc/doclets/gtkdoc/Makefile.am | 2 | ||||
-rw-r--r-- | valadoc/doclets/html/Makefile.am | 4 | ||||
-rw-r--r-- | valadoc/doclets/html/doclet.vala | 2 | ||||
-rw-r--r-- | valadoc/tests/Makefile.am | 2 |
7 files changed, 9 insertions, 9 deletions
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/ \ |