summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary V. Vaughan <gary@gnu.org>2013-09-15 18:50:02 +0700
committerGary V. Vaughan <gary@gnu.org>2013-09-15 21:33:55 +0700
commitfd5af29d49ea6fd34b626557e3264f0ba9ea443b (patch)
treec97d409891500c1464f37939ef2e687217f12b22
parentf8a843fae07daca14262242638e4d3be9445dc01 (diff)
downloadm4-fd5af29d49ea6fd34b626557e3264f0ba9ea443b.tar.gz
doc: use .texi extension consistently.
* doc/m4.texinfo: Rename from this... * doc/m4.texi: ...to this. * Makefile.am (m4_texinfo): Rename from this... (m4_texi): ...to this. Adjust all callers. * doc/Makeflie.am (m4_TEXINFOS): Adjust. Signed-off-by: Gary V. Vaughan <gary@gnu.org>
-rw-r--r--Changelog7
-rw-r--r--Makefile.am6
-rw-r--r--doc/Makefile.am2
3 files changed, 11 insertions, 4 deletions
diff --git a/Changelog b/Changelog
index 880d2ae3..1f1bd8ff 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,12 @@
2013-09-15 Gary V. Vaughan <gary@gnu.org>
+ doc: use .texi extension consistently.
+ * doc/m4.texinfo: Rename from this...
+ * doc/m4.texi: ...to this.
+ * Makefile.am (m4_texinfo): Rename from this...
+ (m4_texi): ...to this. Adjust all callers.
+ * doc/Makeflie.am (m4_TEXINFOS): Adjust.
+
bootstrap: set copyright_holder explicitly.
* bootstrap.conf (copyright_holder): Explicitly set to the FSF.
diff --git a/Makefile.am b/Makefile.am
index ad48ada1..0977068a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -364,10 +364,10 @@ EXTRA_DIST += $(TESTSUITE) $(TESTSUITE_AT) $(OTHER_FILES) \
# Using variables so that this snippet is not too wide and can
# be used as is in Texinfo @example/@end example.
-m4_texinfo = $(srcdir)/doc/m4.texinfo
+m4_texi = $(srcdir)/doc/m4.texi
generate = $(AWK) -f $(srcdir)/tests/generate.awk
-$(srcdir)/tests/generated.at: tests/generate.awk $(m4_texinfo)
- $(generate) $(m4_texinfo) >$@t
+$(srcdir)/tests/generated.at: tests/generate.awk $(m4_texi)
+ $(generate) $(m4_texi) >$@t
mv $@t $@
AUTOM4TE = $(SHELL) $(srcdir)/$(config_aux_dir)/missing --run autom4te
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 92337649..d1b8ab9a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,7 +21,7 @@ MAINTAINERCLEANFILES =
EXTRA_DIST =
config_aux_dir = build-aux
-info_TEXINFOS = m4.texinfo
+info_TEXINFOS = m4.texi
m4_TEXINFOS = regexprops-generic.texi fdl-1.3.texi gpl-3.0.texi
dist_man_MANS = $(srcdir)/m4.1
EXTRA_DIST += gendocs_template