[gnus git] branch master updated: m0-11-22-g6d39a9d =1= Add .info extension to info files (synch with Emacs)
Katsumi Yamaoka <[email protected]> Tue, 10 Jun 2014 09:39:52 +0200
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 6d39a9df4127918e7cb38a3f240142c8b538dcdb (commit)
from 85f52a3587056190592990918792c7424cd9a9e5 (commit)
- Log -----------------------------------------------------------------
commit 6d39a9df4127918e7cb38a3f240142c8b538dcdb
Author: Katsumi Yamaoka <[email protected]>
Date: Tue Jun 10 07:39:23 2014 +0000
Add .info extension to info files (synch with Emacs)
2014-06-10 Katsumi Yamaoka <[email protected]>
* Makefile.in (.texi, makeinfo):
Don't specify output file name for makeinfo.
(clean, distclean, install, uninstall): Delete old info files.
2014-06-10 Glenn Morris <[email protected]>
* auth.texi, emacs-mime.texi, epa.texi, gnus-coding.texi, gnus.texi,
message.texi, sieve.texi: Add .info extension to @setfilename commands.
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 3748f72..7806de9 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,16 @@
+2014-06-10 Katsumi Yamaoka <[email protected]>
+
+ Add .info extension to info files.
+
+ * Makefile.in (.texi, makeinfo):
+ Don't specify output file name for makeinfo.
+ (clean, distclean, install, uninstall): Delete old info files.
+
+2014-06-10 Glenn Morris <[email protected]>
+
+ * auth.texi, emacs-mime.texi, epa.texi, gnus-coding.texi, gnus.texi,
+ message.texi, sieve.texi: Add .info extension to @setfilename commands.
+
2014-05-04 Glenn Morris <[email protected]>
* message.texi (Header Commands): Replace `iff'.
diff --git a/texi/Makefile.in b/texi/Makefile.in
index 6dddacc..5a56e7d 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -34,10 +34,10 @@ most: texi2latex.elc latex latexps
.SUFFIXES: .texi .dvi .ps .pdf .latexi .dvi-x .pdf-x
.texi:
+ rm -f $@{,-[0-9],.info,.info-[0-9]}; \
if test "x$(MAKEINFO)" != "xno" ; then \
- LC_ALL=C $(MAKEINFO) -I $(srcdir) --enable-encoding -o $* $<; \
+ LC_ALL=C $(MAKEINFO) -I $(srcdir) --enable-encoding $<; \
else \
- rm -f $@; \
$(EMACSINFO) $<; \
fi
@@ -105,8 +105,8 @@ almost-clean:
thumbdta.tex xface.tex *.tpt gnus-manual-*.pdf gnus-manual-*.ps.gz
makeinfo:
- LC_ALL=C makeinfo --enable-encoding -o gnus gnus.texi
- LC_ALL=C makeinfo --enable-encoding -o message message.texi
+ LC_ALL=C makeinfo --enable-encoding gnus.texi
+ LC_ALL=C makeinfo --enable-encoding message.texi
texi2latex.elc: texi2latex.el
srcdir=$(srcdir)/../lisp $(EMACSCOMP) -l $(srcdir)/../lisp/dgnushack.el --eval '(byte-compile-file "$(srcdir)/texi2latex.el")'
@@ -188,20 +188,26 @@ out:
scp gnus-manual-*.ps.gz gnus-manual-*.pdf www@quimby:html/gnus/documents
clean: almost-clean
+ @for file in $(INFO_DEPS); do \
+ echo "rm -f $$file{,-[0-9]}"; \
+ rm -f $$file{,-[0-9]}; \
+ done
rm -f gnus.dvi gnus.ps texi2latex.elc
rm -f gnus-manual-a4.* gnus-manual-standard.*
distclean: clean
- rm -f *.orig *.rej *.elc *~ gnus-[0-9] gnus-[0-9][0-9] Makefile
- rm -f message-[0-9]
- rm -f $(INFO_DEPS)
+ @for file in $(INFO_DEPS); do \
+ echo "rm -f $$file{,-[0-9],.info,.info-[0-9]}"; \
+ rm -f $$file{,-[0-9],.info,.info-[0-9]}; \
+ done
+ rm -f *.orig *.rej *.elc *~ Makefile
rm -f gnusconfig.tex
install: $(INFO_DEPS)
$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(infodir)"
- @list='$(INFO_DEPS)'; \
- for file in $$list; do \
- for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+ @for file in $(INFO_DEPS); do \
+ rm -f $(DESTDIR)$(infodir)/$$file{,-[0-9],.info,.info-[0-9]}; \
+ for ifile in `echo $$file.info $$file.info-[0-9]`; do \
if test -f $$ifile; then \
echo "$(INSTALL_DATA) $$ifile \"$(DESTDIR)$(infodir)/$$ifile\""; \
$(INSTALL_DATA) $$ifile "$(DESTDIR)$(infodir)/$$ifile"; \
@@ -209,27 +215,23 @@ install: $(INFO_DEPS)
done; \
done
@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
- list='$(INFO_DEPS)'; \
- for file in $$list; do \
- echo "install-info --info-dir=\"$(DESTDIR)$(infodir)\" \"$(DESTDIR)$(infodir)/$$file\"";\
- install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$file" || :;\
+ for file in $(INFO_DEPS); do \
+ echo "install-info --info-dir=\"$(DESTDIR)$(infodir)\" \"$(DESTDIR)$(infodir)/$$file.info\"";\
+ install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$file.info" || :;\
done; \
else : ; fi
uninstall:
- @list='$(INFO_DEPS)'; \
- for file in $$list; do \
- for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
- rm -f "$(DESTDIR)$(infodir)/$$ifile"; \
- done; \
- done
@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
- list='$(INFO_DEPS)'; \
- for file in $$list; do \
- echo "install-info --delete --info-dir=\"$(DESTDIR)$(infodir)\" \"$(DESTDIR)$(infodir)/$$file\"";\
- install-info --delete --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$file" || :;\
+ for file in $(INFO_DEPS); do \
+ echo "install-info --delete --info-dir=\"$(DESTDIR)$(infodir)\" \"$(DESTDIR)$(infodir)/$$file.info\"";\
+ install-info --delete --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$file.info" || :;\
done; \
else : ; fi
+ @for file in $(INFO_DEPS); do \
+ echo "rm -f $(DESTDIR)$(infodir)/$$file{,-[0-9],.info,.info-[0-9]}"; \
+ rm -f $(DESTDIR)$(infodir)/$$file{,-[0-9],.info,.info-[0-9]}; \
+ done
tmps:
cd ps; make all
diff --git a/texi/auth.texi b/texi/auth.texi
index 67bd232..521358a 100644
--- a/texi/auth.texi
+++ b/texi/auth.texi
@@ -4,7 +4,7 @@
@set VERSION 0.3
-@setfilename auth
+@setfilename auth.info
@settitle Emacs auth-source Library @value{VERSION}
@documentencoding UTF-8
diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 6c0a830..44269ea 100644
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -2,7 +2,7 @@
@include gnus-overrides.texi
-@setfilename emacs-mime
+@setfilename emacs-mime.info
@settitle Emacs MIME Manual
@synindex fn cp
@synindex vr cp
diff --git a/texi/epa.texi b/texi/epa.texi
index c9a95b3..48b66c3 100644
--- a/texi/epa.texi
+++ b/texi/epa.texi
@@ -1,6 +1,6 @@
\input texinfo @c -*- mode: texinfo -*-
@c %**start of header
-@setfilename epa
+@setfilename epa.info
@settitle EasyPG Assistant User's Manual
@documentencoding UTF-8
@c %**end of header
diff --git a/texi/gnus-coding.texi b/texi/gnus-coding.texi
index 44cc29b..0b2b063 100644
--- a/texi/gnus-coding.texi
+++ b/texi/gnus-coding.texi
@@ -1,6 +1,6 @@
\input texinfo
-@setfilename gnus-coding
+@setfilename gnus-coding.info
@settitle Gnus Coding Style and Maintenance Guide
@documentencoding UTF-8
@syncodeindex fn cp
diff --git a/texi/gnus.texi b/texi/gnus.texi
index a66f526..c77d4db 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -2,7 +2,7 @@
@include gnus-overrides.texi
-@setfilename gnus
+@setfilename gnus.info
@settitle Gnus Manual
@syncodeindex fn cp
@syncodeindex vr cp
diff --git a/texi/message.texi b/texi/message.texi
index 86d70c4..403c448 100644
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -2,7 +2,7 @@
@include gnus-overrides.texi
-@setfilename message
+@setfilename message.info
@settitle Message Manual
@documentencoding UTF-8
@synindex fn cp
diff --git a/texi/sieve.texi b/texi/sieve.texi
index 44f17eb..0a417c5 100644
--- a/texi/sieve.texi
+++ b/texi/sieve.texi
@@ -2,7 +2,7 @@
@include gnus-overrides.texi
-@setfilename sieve
+@setfilename sieve.info
@settitle Emacs Sieve Manual
@documentencoding UTF-8
@synindex fn cp
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
texi/ChangeLog | 13 +++++++++++++
texi/Makefile.in | 50 +++++++++++++++++++++++++------------------------
texi/auth.texi | 2 +-
texi/emacs-mime.texi | 2 +-
texi/epa.texi | 2 +-
texi/gnus-coding.texi | 2 +-
texi/gnus.texi | 2 +-
texi/message.texi | 2 +-
texi/sieve.texi | 2 +-
9 files changed, 46 insertions(+), 31 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project