Control: tags -1 + patch
Hello Andriy Grytsenko,
Thanks for your quick followup in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888670#43
Always nice to know that the maintainer is still around before
considering if it's useful to spend time trying to help out.
Hopefully the attached patch will help (but please review it thoroughly
and check the porting guide Simon linked to)....
(Also note the porting guide has suggestions for autogen.sh, which is
not included in the debian source package. You probably want to set up
your project forked from the
https://gitlab.gnome.org/Archive/gnome-system-tools/ git repo which has
it though.)
On Fri, Dec 27, 2019 at 10:25:27PM +0000, Simon McVittie wrote:
[...]
> The supported replacement is yelp.m4 in yelp-tools, as used
> in many GNOME 3 packages. A porting guide is available:
> https://wiki.gnome.org/Initiatives/GnomeGoals/NewDocumentationInfrastructure
[...]
Regards,
Andreas Henriksson
PS. The debian/control changes is: yelp replaces gnome-doc-utils,
yelp-tools has the yelp.m4 file, and xdg-utils is recommended as
xdg-open is now the command used to open the help urls.
--- a/configure.in 2020-01-16 21:28:00.000000000 +0100
+++ b/configure.in 2020-01-26 22:19:46.188202249 +0100
@@ -9,7 +9,7 @@ IT_PROG_INTLTOOL([0.35.0])
AM_CONFIG_HEADER(config.h)
-GNOME_DOC_INIT
+YELP_HELP_INIT
AM_MAINTAINER_MODE
--- a/debian/control 2018-04-29 18:55:21.000000000 +0200
+++ b/debian/control 2020-01-26 22:38:13.509048083 +0100
@@ -19,7 +19,8 @@ Build-Depends: cdbs (>= 0.4.93~),
gettext,
libxml-parser-perl,
gnome-pkg-tools,
- gnome-doc-utils (>= 0.3.2),
+ yelp,
+ yelp-tools,
pkg-config
Standards-Version: 4.1.4
@@ -28,6 +28,7 @@ Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
policykit-1-gnome | mate-polkit
+Recommends: xdg-utils
Suggests: ntp
Replaces: ximian-setup-tools, gnome-network-admin
Conflicts: gnome-network-admin
--- a/doc/network/Makefile.am 2010-12-12 13:16:01.000000000 +0100
+++ b/doc/network/Makefile.am 2020-01-26 22:26:55.232023314 +0100
@@ -1,12 +1,10 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
-DOC_MODULE = network-admin
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = figures/network-tool.png
+HELP_ID = network-admin
+HELP_FILES = legal.xml
+HELP_MEDIA = figures/network-tool.png
-DOC_LINGUAS = ca cs de el en_GB es fr oc pt_BR sl sv it zh_CN
+HELP_LINGUAS = ca cs de el en_GB es fr oc pt_BR sl sv it zh_CN
-include $(top_srcdir)/git.mk
--- a/doc/services/Makefile.am 2020-01-16 21:28:00.000000000 +0100
+++ b/doc/services/Makefile.am 2020-01-26 22:27:39.929288183 +0100
@@ -1,12 +1,10 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
-DOC_MODULE = services-admin
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = \
+HELP_ID = services-admin
+HELP_FILES = legal.xml
+HELP_MEDIA = \
figures/services-tool.png
-DOC_LINGUAS = ca cs de el en_GB es fr gl oc pl pt_BR sl sv it zh_CN
+HELP_LINGUAS = ca cs de el en_GB es fr gl oc pl pt_BR sl sv it zh_CN
-include $(top_srcdir)/git.mk
--- a/doc/shares/Makefile.am 2010-12-12 13:16:01.000000000 +0100
+++ b/doc/shares/Makefile.am 2020-01-26 22:28:06.698129399 +0100
@@ -1,10 +1,8 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
-DOC_MODULE = shares-admin
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = figures/shares-tool.png
-DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR sl sv zh_CN
+HELP_ID = shares-admin
+HELP_FILES = legal.xml
+HELP_MEDIA = figures/shares-tool.png
+HELP_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR sl sv zh_CN
-include $(top_srcdir)/git.mk
--- a/doc/time/Makefile.am 2020-01-16 21:28:00.000000000 +0100
+++ b/doc/time/Makefile.am 2020-01-26 22:28:29.122947233 +0100
@@ -1,15 +1,13 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
-DOC_MODULE = time-admin
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = \
+HELP_ID = time-admin
+HELP_FILES = legal.xml
+HELP_MEDIA = \
figures/time-map.png \
figures/time-servers.png \
figures/time-tool-automatic.png \
figures/time-tool-manual.png
-DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR ru sl sv zh_CN
+HELP_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR ru sl sv zh_CN
-include $(top_srcdir)/git.mk
--- a/doc/users/Makefile.am 2010-12-12 13:16:01.000000000 +0100
+++ b/doc/users/Makefile.am 2020-01-26 22:28:52.483774264 +0100
@@ -1,12 +1,10 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
-DOC_MODULE = users-admin
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = figures/users-tool.png \
+HELP_ID = users-admin
+HELP_FILES = legal.xml
+HELP_MEDIA = figures/users-tool.png \
figures/groups.png
-DOC_LINGUAS = ca cs de el en_GB es fr gl oc pt_BR ru sl sv it zh_CN
+HELP_LINGUAS = ca cs de el en_GB es fr gl oc pt_BR ru sl sv it zh_CN
-include $(top_srcdir)/git.mk
--- a/Makefile.am 2010-10-06 11:54:53.000000000 +0200
+++ b/Makefile.am 2020-01-26 22:19:08.906995619 +0100
@@ -12,7 +12,6 @@ EXTRA_DIST = \
intltool-update.in \
omf.make \
xmldocs.make \
- gnome-doc-utils.make \
gnome-system-tools.pc.in \
org.gnome.system-tools.gschema.xml.in
@@ -30,7 +29,6 @@ DISTCLEANFILES = \
backends/intltool-extract \
backends/intltool-merge \
backends/intltool-update \
- gnome-doc-utils.make \
gnome-system-tools.pc \
org.gnome.system-tools.gschema.xml
--- a/src/common/gst-tool.c 2020-01-16 21:28:00.000000000 +0100
+++ b/src/common/gst-tool.c 2020-01-26 22:37:02.403018017 +0100
@@ -412,9 +412,9 @@ gst_tool_show_help (GstTool *tool, gchar
}
if (section) {
- command = g_strconcat ("gnome-help ghelp://", uri, "?", section, NULL);
+ command = g_strconcat ("xdg-open help://", uri, "?", section, NULL);
} else {
- command = g_strconcat ("gnome-help ghelp://", uri, NULL);
+ command = g_strconcat ("xdg-open help://", uri, NULL);
}
--- a/gnome-doc-utils.make 2011-04-02 15:05:29.000000000 +0200
+++ b/gnome-doc-utils.make 1970-01-01 01:00:00.000000000 +0100
@@ -1,655 +0,0 @@
-# gnome-doc-utils.make - make magic for building documentation
-# Copyright (C) 2004-2005 Shaun McCance <sha...@gnome.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-################################################################################
-## @@ Generating Header Files
-
-## @ DOC_H_FILE
-## The name of the header file to generate
-DOC_H_FILE ?=
-
-## @ DOC_H_DOCS
-## The input DocBook files for generating the header file
-DOC_H_DOCS ?=
-
-$(DOC_H_FILE): $(DOC_H_DOCS);
- @rm -f $@.tmp; touch $@.tmp;
- echo 'const gchar* documentation_credits[] = {' >> $@.tmp
- list='$(DOC_H_DOCS)'; for doc in $$list; do \
- xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
- if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
- xsltproc --path "$$xmlpath" $(_credits) $$doc; \
- done | sort | uniq \
- | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
- | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
- echo ' NULL' >> $@.tmp
- echo '};' >> $@.tmp
- echo >> $@.tmp
- list='$(DOC_H_DOCS)'; for doc in $$list; do \
- xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \
- if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \
- docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
- | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
- echo $$xmlpath; \
- ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \
- for id in $$ids; do \
- echo '#define HELP_'`echo $$docid`'_'`echo $$id \
- | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
- done; \
- echo >> $@.tmp; \
- done;
- cp $@.tmp $@ && rm -f $@.tmp
-
-dist-check-gdu:
-if !HAVE_GNOME_DOC_UTILS
- @echo "*** GNOME Doc Utils must be installed in order to make dist"
- @false
-endif
-
-.PHONY: dist-doc-header
-dist-doc-header: $(DOC_H_FILE)
- @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
- echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
- $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
-
-doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
-
-.PHONY: clean-doc-header
-_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-clean-local: $(_clean_doc_header)
-distclean-local: $(_clean_doc_header)
-mostlyclean-local: $(_clean_doc_header)
-maintainer-clean-local: $(_clean_doc_header)
-clean-doc-header:
- rm -f $(DOC_H_FILE)
-
-all: $(DOC_H_FILE)
-
-
-################################################################################
-## @@ Generating Documentation Files
-
-## @ DOC_MODULE
-## The name of the document being built
-DOC_MODULE ?=
-
-## @ DOC_ID
-## The unique identifier for a Mallard document
-DOC_ID ?=
-
-## @ DOC_PAGES
-## Page files in a Mallard document
-DOC_PAGES ?=
-
-## @ DOC_ENTITIES
-## Files included with a SYSTEM entity
-DOC_ENTITIES ?=
-
-## @ DOC_INCLUDES
-## Files included with XInclude
-DOC_INCLUDES ?=
-
-## @ DOC_FIGURES
-## Figures and other external data
-DOC_FIGURES ?=
-
-## @ DOC_FORMATS
-## The default formats to be built and installed
-DOC_FORMATS ?= docbook
-_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
-
-## @ DOC_LINGUAS
-## The languages this document is translated into
-DOC_LINGUAS ?=
-_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \
- $(filter $(LINGUAS),$(DOC_LINGUAS)), \
- $(DOC_LINGUAS))
-
-_DOC_ABS_SRCDIR = @abs_srcdir@
-
-
-################################################################################
-## Variables for Bootstrapping
-
-_xml2po ?= `which xml2po`
-_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
-
-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-
-if ENABLE_SK
-_ENABLE_SK = true
-_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
-_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
-_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
-endif
-
-
-################################################################################
-## @@ Rules for OMF Files
-
-db2omf_args = \
- --stringparam db2omf.basename $(DOC_MODULE) \
- --stringparam db2omf.format $(3) \
- --stringparam db2omf.dtd \
- $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \
- | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \
- --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \
- --stringparam db2omf.omf_dir "$(OMF_DIR)" \
- --stringparam db2omf.help_dir "$(HELP_DIR)" \
- --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \
- $(if $(_ENABLE_SK), \
- --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \
- $(_db2omf) $(2)
-
-## @ _DOC_OMF_IN
-## The OMF input file
-_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
-
-## @ _DOC_OMF_DB
-## The OMF files for DocBook output
-_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \
- $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf))
-
-$(_DOC_OMF_DB) : $(_DOC_OMF_IN)
-$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
- @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
- echo "The file '$(_skcontentslist)' does not exist." >&2; \
- echo "Please check your ScrollKeeper installation." >&2; \
- exit 1; }
- xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
-
-## @ _DOC_OMF_HTML
-## The OMF files for HTML output
-_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \
- $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf))
-
-$(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
-$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
-if ENABLE_SK
- @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
- echo "The file '$(_skcontentslist)' does not exist" >&2; \
- echo "Please check your ScrollKeeper installation." >&2; \
- exit 1; }
-endif
- xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
-
-## @ _DOC_OMF_ALL
-## All OMF output files to be built
-# FIXME
-_DOC_OMF_ALL = \
- $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \
- $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML))
-
-.PHONY: omf
-omf: $(_DOC_OMF_ALL)
-
-
-################################################################################
-## @@ C Locale Documents
-
-## @ _DOC_C_MODULE
-## The top-level documentation file in the C locale
-_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
-
-## @ _DOC_C_PAGES
-## Page files in a Mallard document in the C locale
-_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
-
-## @ _DOC_C_ENTITIES
-## Files included with a SYSTEM entity in the C locale
-_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
-
-## @ _DOC_C_XINCLUDES
-## Files included with XInclude in the C locale
-_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
-
-## @ _DOC_C_DOCS
-## All documentation files in the C locale
-_DOC_C_DOCS = \
- $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
- $(_DOC_C_PAGES) $(_DOC_C_MODULE)
-
-## @ _DOC_C_DOCS_NOENT
-## All documentation files in the C locale,
-## except files included with a SYSTEM entity
-_DOC_C_DOCS_NOENT = \
- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
- $(_DOC_C_PAGES)
-
-## @ _DOC_C_FIGURES
-## All figures and other external data in the C locale
-_DOC_C_FIGURES = $(if $(DOC_FIGURES), \
- $(foreach fig,$(DOC_FIGURES),C/$(fig)), \
- $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png)))
-
-## @ _DOC_C_HTML
-## All HTML documentation in the C locale
-# FIXME: probably have to shell escape to determine the file names
-_DOC_C_HTML = $(foreach f, \
- $(shell xsltproc --xinclude \
- --stringparam db.chunk.basename "$(DOC_MODULE)" \
- $(_chunks) "C/$(DOC_MODULE).xml"), \
- C/$(f).xhtml)
-
-###############################################################################
-## @@ Other Locale Documentation
-
-## @ _DOC_POFILES
-## The .po files used for translating the document
-_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
-
-.PHONY: po
-po: $(_DOC_POFILES)
-
-## @ _DOC_MOFILES
-## The .mo files used for translating the document
-_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
-
-.PHONY: mo
-mo: $(_DOC_MOFILES)
-
-## @ _DOC_LC_MODULES
-## The top-level documentation files in all other locales
-_DOC_LC_MODULES = $(if $(DOC_MODULE), \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
-
-## @ _DOC_LC_PAGES
-## Page files in a Mallard document in all other locales
-_DOC_LC_PAGES = \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \
- $(lc)/$(notdir $(page)) ))
-
-## @ _DOC_LC_XINCLUDES
-## Files included with XInclude in all other locales
-_DOC_LC_INCLUDES = \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
- $(lc)/$(notdir $(inc)) ))
-
-## @ _DOC_LC_HTML
-## All HTML documentation in all other locales
-# FIXME: probably have to shell escape to determine the file names
-_DOC_LC_HTML = \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \
- $(lc)/$(notdir $(doc)) ))
-
-## @ _DOC_LC_DOCS
-## All documentation files in all other locales
-_DOC_LC_DOCS = \
- $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \
- $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
-
-## @ _DOC_LC_FIGURES
-## All figures and other external data in all other locales
-_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
- $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) )
-
-_DOC_SRC_FIGURES = \
- $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \
- $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) ))
-
-$(_DOC_POFILES):
- @if ! test -d $(dir $@); then \
- echo "mkdir $(dir $@)"; \
- mkdir "$(dir $@)"; \
- fi
- @if test ! -f $@ -a -f $(srcdir)/$@; then \
- echo "cp $(srcdir)/$@ $@"; \
- cp "$(srcdir)/$@" "$@"; \
- fi;
- @docs=; \
- list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
- docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
- done; \
- if ! test -f $@; then \
- echo "(cd $(dir $@) && \
- $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
- (cd $(dir $@) && \
- $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
- else \
- echo "(cd $(dir $@) && \
- $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
- (cd $(dir $@) && \
- $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
- fi
-
-$(_DOC_MOFILES): %.mo: %.po
- @if ! test -d $(dir $@); then \
- echo "mkdir $(dir $@)"; \
- mkdir "$(dir $@)"; \
- fi
- msgfmt -o $@ $<
-
-# FIXME: fix the dependancy
-# FIXME: hook xml2po up
-$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
-$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
- if ! test -d $(dir $@); then mkdir $(dir $@); fi
- if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
- mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
- if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
- (cd $(dir $@) && \
- $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
- "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
-
-## @ _DOC_POT
-## A pot file
-_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot)
-.PHONY: pot
-pot: $(_DOC_POT)
-$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
- $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
-
-
-################################################################################
-## @@ All Documentation
-
-## @ _DOC_HTML_ALL
-## All HTML documentation, only if it's built
-_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
- $(_DOC_C_HTML) $(_DOC_LC_HTML))
-
-_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
-
-$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
- xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-
-
-################################################################################
-## All
-
-all: \
- $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \
- $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
- $(_DOC_HTML_ALL) $(_DOC_POFILES)
-
-
-################################################################################
-## Clean
-
-.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-
-clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
-clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
-clean-doc-lc:
- rm -f $(_DOC_LC_DOCS)
- rm -f $(_DOC_MOFILES)
- @list='$(_DOC_POFILES)'; for po in $$list; do \
- if ! test "$$po" -ef "$(srcdir)/$$po"; then \
- echo "rm -f $$po"; \
- rm -f "$$po"; \
- fi; \
- done
-# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
- @for lc in C $(_DOC_REAL_LINGUAS); do \
- if test -f "$$lc/.xml2po.mo"; then \
- echo "rm -f $$lc/.xml2po.mo"; \
- rm -f "$$lc/.xml2po.mo"; \
- fi; \
- done
-clean-doc-dir: clean-doc-lc
- @for lc in C $(_DOC_REAL_LINGUAS); do \
- for dir in `find $$lc -depth -type d`; do \
- if ! test $$dir -ef $(srcdir)/$$dir; then \
- echo "rmdir $$dir"; \
- rmdir "$$dir"; \
- fi; \
- done; \
- done
-
-_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
-_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
-_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
-_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
-
-clean-local: \
- $(_clean_omf) $(_clean_dsk) \
- $(_clean_lc) $(_clean_dir)
-distclean-local: \
- $(_clean_omf) $(_clean_dsk) \
- $(_clean_lc) $(_clean_dir)
-mostlyclean-local: \
- $(_clean_omf) $(_clean_dsk) \
- $(_clean_lc) $(_clean_dir)
-maintainer-clean-local: \
- $(_clean_omf) $(_clean_dsk) \
- $(_clean_lc) $(_clean_dir)
-
-
-
-################################################################################
-## Dist
-
-.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
-doc-dist-hook: \
- $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \
- $(if $(_DOC_C_FIGURES),dist-doc-figs) \
- $(if $(_DOC_OMF_IN),dist-doc-omf)
-# $(if $(_DOC_DSK_IN),dist-doc-dsk)
-
-dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)
- @for lc in C $(_DOC_REAL_LINGUAS); do \
- echo " $(mkinstalldirs) $(distdir)/$$lc"; \
- $(mkinstalldirs) "$(distdir)/$$lc"; \
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
- docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
- if ! test -d "$(distdir)/$$docdir"; then \
- echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
- $(mkinstalldirs) "$(distdir)/$$docdir"; \
- fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-
-dist-doc-figs: $(_DOC_SRC_FIGURES)
- @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \
- for fig in $$list; do \
- if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$fig"; then \
- figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
- if ! test -d "$(distdir)/$$figdir"; then \
- echo "$(mkinstalldirs) $(distdir)/$$figdir"; \
- $(mkinstalldirs) "$(distdir)/$$figdir"; \
- fi; \
- echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \
- $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \
- fi; \
- done;
-
-dist-doc-omf:
- @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \
- echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \
- $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))"
-
-dist-doc-dsk:
- @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \
- echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
- $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
-
-
-
-################################################################################
-## Check
-
-.PHONY: check-doc-docs check-doc-omf
-check: \
- $(if $(DOC_MODULE),check-doc-docs) \
- $(if $(DOC_ID),check-doc-pages) \
- $(if $(_DOC_OMF_IN),check-doc-omf)
-
-check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
- @for lc in C $(_DOC_REAL_LINGUAS); do \
- if test -f "$$lc"; \
- then d=; \
- xmlpath="$$lc"; \
- else \
- d="$(srcdir)/"; \
- xmlpath="$$lc:$(srcdir)/$$lc"; \
- fi; \
- echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \
- xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
- done
-
-check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
- for lc in C $(_DOC_REAL_LINGUAS); do \
- if test -f "$$lc"; \
- then d=; \
- xmlpath="$$lc"; \
- else \
- d="$(srcdir)/"; \
- xmlpath="$$lc:$(srcdir)/$$lc"; \
- fi; \
- for page in $(DOC_PAGES); do \
- echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
- xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
- done; \
- done
-
-check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
- xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
-
-
-################################################################################
-## Install
-
-.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-
-_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-
-install-data-local: \
- $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \
- $(if $(_DOC_HTML_ALL),install-doc-html) \
- $(if $(_DOC_C_FIGURES),install-doc-figs) \
- $(if $(_DOC_OMF_IN),install-doc-omf)
-# $(if $(_DOC_DSK_IN),install-doc-dsk)
-
-install-doc-docs:
- @for lc in C $(_DOC_REAL_LINGUAS); do \
- echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
- $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
- docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
- docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
- if ! test -d "$$docdir"; then \
- echo "$(mkinstalldirs) $$docdir"; \
- $(mkinstalldirs) "$$docdir"; \
- fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
- done
-
-install-doc-figs:
- @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
- for lc in C $(_DOC_REAL_LINGUAS); do \
- figsymlink=false; \
- if test -f "$$lc/$$fig"; then \
- figfile="$$lc/$$fig"; \
- elif test -f "$(srcdir)/$$lc/$$fig"; then \
- figfile="$(srcdir)/$$lc/$$fig"; \
- else \
- figsymlink=true; \
- fi; \
- figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
- figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
- if ! test -d "$$figdir"; then \
- echo "$(mkinstalldirs) $$figdir"; \
- $(mkinstalldirs) "$$figdir"; \
- fi; \
- figbase=`echo $$fig | sed -e 's/^.*\///'`; \
- if $$figsymlink; then \
- echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
- ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
- else \
- echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
- $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
- fi; \
- done; \
- done
-
-install-doc-html:
- echo install-html
-
-install-doc-omf:
- $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
- done
- @if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
- scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
- fi;
-
-install-doc-dsk:
- echo install-dsk
-
-
-
-################################################################################
-## Uninstall
-
-.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
-uninstall-local: \
- $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \
- $(if $(_DOC_HTML_ALL),uninstall-doc-html) \
- $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
- $(if $(_DOC_OMF_IN),uninstall-doc-omf)
-# $(if $(_DOC_DSK_IN),uninstall-doc-dsk)
-
-uninstall-doc-docs:
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
- rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
- done
-
-uninstall-doc-figs:
- @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
- echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
- rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
- done;
-
-uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- if test "x$(_ENABLE_SK)" = "xtrue"; then \
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- fi; \
- echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- done
