Rename gnudoc->texinfo

3 files changed, 18 insertions, 20 deletions

diff --git a/build-aux/Makefile.each.head/00-gnudoc.mk b/build-aux/Makefile.each.head/00-texinfo.mk
index 631d5766b7..88aaeb5262 100644
--- a/build-aux/Makefile.each.head/00-gnudoc.mk
+++ b/build-aux/Makefile.each.head/00-texinfo.mk
@@ -13,4 +13,4 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-gnudoc.docs ?=
+texinfo.docs ?=
diff --git a/build-aux/Makefile.each.tail/11-gnudoc.mk b/build-aux/Makefile.each.tail/11-texinfo.mk
index 1df4d7363a..9491820f2e 100644
--- a/build-aux/Makefile.each.tail/11-gnudoc.mk
+++ b/build-aux/Makefile.each.tail/11-texinfo.mk
@@ -13,22 +13,22 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$(outdir)/info :  $(addsuffix .info,$(gnudoc.docs))
-files.src.gen  += $(addsuffix .info,$(gnudoc.docs))
-files.out.dvi  += $(addsuffix .dvi ,$(gnudoc.docs))
-files.out.html += $(addsuffix .html,$(gnudoc.docs))
-files.out.pdf  += $(addsuffix .pdf ,$(gnudoc.docs))
-files.out.ps   += $(addsuffix .ps  ,$(gnudoc.docs))
+$(outdir)/info :  $(addsuffix .info,$(texinfo.docs))
+files.src.gen  += $(addsuffix .info,$(texinfo.docs))
+files.out.dvi  += $(addsuffix .dvi ,$(texinfo.docs))
+files.out.html += $(addsuffix .html,$(texinfo.docs))
+files.out.pdf  += $(addsuffix .pdf ,$(texinfo.docs))
+files.out.ps   += $(addsuffix .ps  ,$(texinfo.docs))
 
-files.sys.all  += $(foreach f,$(gnudoc.docs), $(infodir)/$f.info )
-files.sys.dvi  += $(foreach f,$(gnudoc.docs), $(dvidir)/$f.dvi   )
-files.sys.html += $(foreach f,$(gnudoc.docs), $(htmldir)/$f.html )
-files.sys.pdf  += $(foreach f,$(gnudoc.docs), $(pdfdir)/$f.pdf   )
-files.sys.ps   += $(foreach f,$(gnudoc.docs), $(psdir)/$f.ps     )
+files.sys.all  += $(foreach f,$(texinfo.docs), $(infodir)/$f.info )
+files.sys.dvi  += $(foreach f,$(texinfo.docs), $(dvidir)/$f.dvi   )
+files.sys.html += $(foreach f,$(texinfo.docs), $(htmldir)/$f.html )
+files.sys.pdf  += $(foreach f,$(texinfo.docs), $(pdfdir)/$f.pdf   )
+files.sys.ps   += $(foreach f,$(texinfo.docs), $(psdir)/$f.ps     )
 
 $(outdir)/install:
 	$(POST_INSTALL)
-	$(foreach f,$(gnudoc.docs),$(INSTALL_INFO) $(DESTDIR)$(infodir)/$f.info $(DESTDIR)$(infodir)/dir$(at.nl))
+	$(foreach f,$(texinfo.docs),$(INSTALL_INFO) $(DESTDIR)$(infodir)/$f.info $(DESTDIR)$(infodir)/dir$(at.nl))
 
 $(outdir)/%.info: $(srcdir)/%.texi; $(MAKEINFO)  -o $(@D) $<
 $(outdir)/%.info: $(outdir)/%.texi; $(MAKEINFO)  -o $(@D) $<
diff --git a/build-aux/Makefile.once.head/10-gnudoc.mk b/build-aux/Makefile.once.head/10-texinfo.mk
index a53c89fecf..aac2c287a4 100644
--- a/build-aux/Makefile.once.head/10-gnudoc.mk
+++ b/build-aux/Makefile.once.head/10-texinfo.mk
@@ -13,15 +13,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-mod.gnudoc.description = GNU Info page support
-mod.gnudoc.depends += files nested gnuconf
-define mod.gnudoc.doc
+mod.texinfo.description = The GNU documentation system
+mod.texinfo.depends += files nested gnuconf
+define mod.texinfo.doc
 # User variables (in addition to gnuconf):
 #   - `TEXI2HTML ?= makeinfo --html`
 #   - `TEXI2PDF  ?= texi2pdf`
 #   - `TEXI2PS   ?= texi2dvi --ps`
 # Inputs:
-#   - Directory variable : `gnudoc.docs ?=`
+#   - Directory variable : `texinfo.docs ?=`
 # Outputs:
 #   - Global variable    : `files.groups += html dvi pdf ps`
 #   - Global variable    : `nested.targets += info`
@@ -36,14 +36,12 @@ define mod.gnudoc.doc
 #   - target             : `$(outdir)/%.pdf`
 #   - Target             : `$(outdir)/%.ps`
 #
-# The The `gnudoc
-
 # The module counts on the `$(outdir)/install` target being defined by
 # `files`, but not having a rule that executes once the dependencies
 # have been taken care of; it adds a "post-install" rule to add the
 # info files to the index.
 endef
-mod.gnudoc.doc := $(value mod.gnudoc.doc)
+mod.texinfo.doc := $(value mod.texinfo.doc)
 
 TEXI2HTML ?= makeinfo --html
 TEXI2PDF  ?= texi2pdf