From ff3ffff05a7b8b604ae8acae4f80ddc353841c67 Mon Sep 17 00:00:00 2001 From: Daniel Espinosa Date: Thu, 14 Apr 2016 16:51:34 -0500 Subject: [PATCH] Fixed devhelp book name: Fixes bug #685625 --- docs/valadoc/devhelp/Makefile.am | 26 +++++++++++++------------- docs/valadoc/gir-docs/Makefile.am | 5 +++-- docs/valadoc/gtk-doc/Makefile.am | 5 +++-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/docs/valadoc/devhelp/Makefile.am b/docs/valadoc/devhelp/Makefile.am index 943c25d3..46c9fe23 100644 --- a/docs/valadoc/devhelp/Makefile.am +++ b/docs/valadoc/devhelp/Makefile.am @@ -4,7 +4,7 @@ CLEANFILES= VALADOC_FLAGS = \ --driver $(VALAC_VERSION) \ --force \ - --package-name=gxml-$(API_VERSION) \ + --package-name=GXml-$(API_VERSION) \ --package-version=$(PACKAGE_VERSION) \ --pkg glib-2.0 \ --pkg gio-2.0 \ @@ -19,25 +19,25 @@ sources= \ $(top_srcdir)/gxml/*.vala -gxmldocdir=$(datadir)/devhelp/books/gxml-$(API_VERSION) +gxmldocdir=$(datadir)/devhelp/books/GXml-$(API_VERSION) gxmldoc_DATA = \ - gxml/gxml-$(API_VERSION)/gxml-$(API_VERSION).devhelp2 \ - gxml/gxml-$(API_VERSION)/*.png \ - gxml/gxml-$(API_VERSION)/*.html \ - gxml/gxml-$(API_VERSION)/*.htm \ - gxml/gxml-$(API_VERSION)/*.css \ - gxml/gxml-$(API_VERSION)/*.js - -gxmldocimgdir=$(datadir)/devhelp/books/gxml-$(API_VERSION)/img + GXml/GXml-$(API_VERSION)/GXml-$(API_VERSION).devhelp2 \ + GXml/GXml-$(API_VERSION)/*.png \ + GXml/GXml-$(API_VERSION)/*.html \ + GXml/GXml-$(API_VERSION)/*.htm \ + GXml/GXml-$(API_VERSION)/*.css \ + GXml/GXml-$(API_VERSION)/*.js + +gxmldocimgdir=$(datadir)/devhelp/books/GXml-$(API_VERSION)/img gxmldocimg_DATA=\ - gxml/gxml-$(API_VERSION)/img/* + GXml/GXml-$(API_VERSION)/img/* $(gxmldoc_DATA) $(gxmldocimg_DATA): gxml-doc gxml-doc: - $(VALADOC) -o gxml --doclet=devhelp $(VALADOC_FLAGS) $(sources) + $(VALADOC) -o GXml --doclet=devhelp $(VALADOC_FLAGS) $(sources) clean-local: clean-local-gxml-doc .PHONY: clean-local-gxml-doc clean-local-gxml-doc: - -rm -rf gxml + -rm -rf GXml diff --git a/docs/valadoc/gir-docs/Makefile.am b/docs/valadoc/gir-docs/Makefile.am index eb75518f..9cc0a983 100644 --- a/docs/valadoc/gir-docs/Makefile.am +++ b/docs/valadoc/gir-docs/Makefile.am @@ -4,7 +4,7 @@ CLEANFILES= VALADOC_FLAGS = \ --driver $(VALAC_VERSION) \ --force \ - --package-name=gxml-$(API_VERSION) \ + --package-name=GXml-$(API_VERSION) \ --package-version=$(PACKAGE_VERSION) \ --pkg glib-2.0 \ --pkg gio-2.0 \ @@ -12,7 +12,8 @@ VALADOC_FLAGS = \ --pkg gee-0.8 \ --vapidir=$(top_srcdir)/gxml \ --vapidir=$(top_srcdir)/vapi \ - $(top_srcdir)/vapi/xlibxml-1.0.vapi + $(top_srcdir)/vapi/xlibxml-1.0.vapi \ + $(top_srcdir)/vapi/config.vapi sources= \ $(top_srcdir)/gxml/*.vala diff --git a/docs/valadoc/gtk-doc/Makefile.am b/docs/valadoc/gtk-doc/Makefile.am index ac8df660..d1dbbcd7 100644 --- a/docs/valadoc/gtk-doc/Makefile.am +++ b/docs/valadoc/gtk-doc/Makefile.am @@ -4,7 +4,7 @@ CLEANFILES= VALADOC_FLAGS = \ --driver $(VALAC_VERSION) \ --force \ - --package-name=gxml-$(API_VERSION) \ + --package-name=GXml-$(API_VERSION) \ --package-version=$(PACKAGE_VERSION) \ --pkg glib-2.0 \ --pkg gio-2.0 \ @@ -12,7 +12,8 @@ VALADOC_FLAGS = \ --pkg gee-0.8 \ --vapidir=$(top_srcdir)/gxml \ --vapidir=$(top_srcdir)/vapi \ - $(top_srcdir)/vapi/xlibxml-1.0.vapi + $(top_srcdir)/vapi/xlibxml-1.0.vapi \ + $(top_srcdir)/vapi/config.vapi sources= \ $(top_srcdir)/gxml/*.vala -- GitLab