From 37c23898ed6ba5068e7edf64e3c91459044629d1 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 26 Sep 2014 20:45:42 -0700
Subject: [PATCH] doc: Rename .texinfo files to use .texi extension.

Newer versions of Automake complained that the .texinfo extension was
deprecated.
---
 doc/automake.mk                         | 6 +++---
 doc/{pspp-dev.texinfo => pspp-dev.texi} | 4 ++--
 doc/{pspp.texinfo => pspp.texi}         | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename doc/{pspp-dev.texinfo => pspp-dev.texi} (94%)
 rename doc/{pspp.texinfo => pspp.texi} (94%)

diff --git a/doc/automake.mk b/doc/automake.mk
index 6e14132f0c..54af89a6ff 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-info_TEXINFOS = doc/pspp.texinfo doc/pspp-dev.texinfo
+info_TEXINFOS = doc/pspp.texi doc/pspp-dev.texi
 
 doc_pspp_TEXINFOS = doc/version.texi \
 	doc/bugs.texi \
@@ -55,10 +55,10 @@ $(srcdir)/doc/tut.texi:
 
 # The SED and AWK filters in this rule, are to work-around some nasty bugs in makeinfo version 4.13, which produces
 # broken docbook xml.  These workarounds are rather horrible and must be removed asap.
-$(srcdir)/doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
+$(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS)
 	@$(MKDIR_P)  doc
 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
-		$(top_srcdir)/doc/pspp.texinfo -o - \
+		$(top_srcdir)/doc/pspp.texi -o - \
 		| $(SED) -e 's/Time-&-Date/Time-\&amp;-Date/g' \
 		-e 's/&ldquo;/\&#8220;/g' \
 		-e 's/&rdquo;/\&#8221;/g' \
diff --git a/doc/pspp-dev.texinfo b/doc/pspp-dev.texi
similarity index 94%
rename from doc/pspp-dev.texinfo
rename to doc/pspp-dev.texi
index 41b8566c9e..ee74424ff0 100644
--- a/doc/pspp-dev.texinfo
+++ b/doc/pspp-dev.texi
@@ -37,7 +37,7 @@
 This manual is for GNU PSPP version @value{VERSION},
 software for statistical analysis.
 
-Copyright @copyright{} 1997, 1998, 2004, 2005, 2007, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 1997, 1998, 2004, 2005, 2007, 2010, 2014 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -106,5 +106,5 @@ Free Documentation License".
 @bye
 
 @c Local Variables:
-@c compile-command: "makeinfo pspp-dev.texinfo"
+@c compile-command: "makeinfo pspp-dev.texi"
 @c End:
diff --git a/doc/pspp.texinfo b/doc/pspp.texi
similarity index 94%
rename from doc/pspp.texinfo
rename to doc/pspp.texi
index eae4f540a6..74ce9d7386 100644
--- a/doc/pspp.texinfo
+++ b/doc/pspp.texi
@@ -54,7 +54,7 @@
 This manual is for GNU PSPP version @value{VERSION},
 software for statistical analysis.
 
-Copyright @copyright{} 1997, 1998, 2004, 2005, 2009, 2012, 2013 Free Software Foundation, Inc.
+Copyright @copyright{} 1997, 1998, 2004, 2005, 2009, 2012, 2013, 2014 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -153,6 +153,6 @@ in the production of this manual.
 @bye
 
 @c Local Variables:
-@c use (texinfo-multiple-files-update "pspp.texinfo")  in emacs to keep these files consistent
-@c compile-command: "makeinfo pspp.texinfo"
+@c use (texinfo-multiple-files-update "pspp.texi")  in emacs to keep these files consistent
+@c compile-command: "makeinfo pspp.texi"
 @c End:
-- 
2.30.2