diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ChangeLog | 8 | ||||
| -rw-r--r-- | etc/Makefile.in | 29 | ||||
| -rw-r--r-- | etc/configure.texi | 12 | ||||
| -rw-r--r-- | etc/standards.texi | 16 |
4 files changed, 17 insertions, 48 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 64fdee6c0..35e23bec2 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,11 +1,3 @@ -2006-02-27 Carlos O'Donell <carlos@codesourcery.com> - - * Makefile.in: TEXI2HTML uses makeinfo. Define - HTMLFILES. Add html targets. - * configure.texi: Use ifnottex. Add alternative - image format specifier as jpg. - * standards.texi: Use ifnottex. - 2005-10-21 Mark Mitchell <mark@codesourcery.com> * texi2pod.pl: Substitue for @value even when part of @include. diff --git a/etc/Makefile.in b/etc/Makefile.in index df461cfd5..b99daf99b 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -39,10 +39,7 @@ MAKEINFO = `if [ -f ../texinfo/makeinfo/makeinfo ]; \ TEXI2DVI = `if [ -f ../texinfo/util/texi2dvi ]; \ then echo ../texinfo/util/texi2dvi; \ else echo texi2dvi; fi` -TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \ - then echo "../texinfo/makeinfo/makeinfo --html"; \ - else echo "makeinfo --html"; fi` - +TEXI2HTML = texi2html DVIPS = dvips # Where to find texinfo.tex to format documentation with TeX. @@ -53,7 +50,6 @@ TEXIDIR = $(srcdir)/../texinfo INFOFILES = standards.info configure.info DVIFILES = standards.dvi configure.dvi -HTMLFILES = standards.html configure.html all: info install: install-info @@ -86,18 +82,6 @@ install-info: info done; \ fi -html: - for f in $(HTMLFILES); do \ - if test -f $(srcdir)/`echo $$f | sed -e 's/.html$$/.texi/'`; then \ - if $(MAKE) "TEXI2HTML=$(TEXI2HTML)" $$f; then \ - true; \ - else \ - exit 1; \ - fi; \ - fi; \ - done - - dvi: for f in $(DVIFILES); do \ if test -f $(srcdir)/`echo $$f | sed -e 's/.dvi$$/.texi/'`; then \ @@ -112,9 +96,6 @@ dvi: standards.info: $(srcdir)/standards.texi $(srcdir)/make-stds.texi $(MAKEINFO) --no-split -I$(srcdir) -o standards.info $(srcdir)/standards.texi -standards.html: $(srcdir)/standards.texi $(srcdir)/make-stds.texi - $(TEXI2HTML) --no-split -I$(srcdir) -o standards.html $(srcdir)/standards.texi - standards.dvi: $(srcdir)/standards.texi TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/standards.texi @@ -150,15 +131,12 @@ configure.ps: configure.dvi $(srcdir)/configdev.ein $(srcdir)/configbuild.ein rm -f configdev.eps configbuild.eps configure.html: $(srcdir)/configure.texi - cp $(srcdir)/configdev.jin configdev.jpg - cp $(srcdir)/configbuild.jin configbuild.jpg - $(TEXI2HTML) --no-split -I$(srcdir) -o configure.html $(srcdir)/configure.texi + $(TEXI2HTML) -split_chapter $(srcdir)/configure.texi clean: rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs - rm -f configdev.txt configbuild.txt - rm -f configdev.eps configbuild.eps + rm -f configdev.txt configbuild.txt configdev.eps configbuild.eps rm -f configdev.jpg configbuild.jpg mostlyclean: clean @@ -167,7 +145,6 @@ distclean: clean rm -f Makefile config.status config.cache maintainer-clean realclean: distclean - rm -f *.html* rm -f *.info* Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag) diff --git a/etc/configure.texi b/etc/configure.texi index 385a7c447..d69dc414d 100644 --- a/etc/configure.texi +++ b/etc/configure.texi @@ -10,7 +10,7 @@ * configure: (configure). The GNU configure and build system @end direntry -@ifnottex +@ifinfo This file documents the GNU configure and build system. Copyright (C) 1998 Cygnus Solutions. @@ -35,7 +35,7 @@ Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. -@end ifnottex +@end ifinfo @titlepage @title The GNU configure and build system @@ -60,7 +60,7 @@ except that this permission notice may be stated in a translation approved by the Free Software Foundation. @end titlepage -@ifnottex +@ifinfo @node Top @top GNU configure and build system @@ -79,7 +79,7 @@ The GNU configure and build system. * Index:: Index. @end menu -@end ifnottex +@end ifinfo @node Introduction @chapter Introduction @@ -1085,7 +1085,7 @@ are in rectangles with rounded corners @end ifnotinfo (e.g., @samp{autoheader} is the name of a tool, not the name of a file). -@image{configdev,,,,jpg} +@image{configdev} @node Written Developer Files @subsection Written Developer Files @@ -1235,7 +1235,7 @@ Here is a picture of the files which will be created at build time. @file{config.status} is both a created file and a shell script which is run to create other files, and the picture attempts to show that. -@image{configbuild,,,,jpg} +@image{configbuild} @node Build Files Description @subsection Build Files Description diff --git a/etc/standards.texi b/etc/standards.texi index 490e15b15..5aa508e01 100644 --- a/etc/standards.texi +++ b/etc/standards.texi @@ -6,13 +6,13 @@ @set lastupdate February 14, 2002 @c %**end of header -@ifnottex +@ifinfo @format START-INFO-DIR-ENTRY * Standards: (standards). GNU coding standards. END-INFO-DIR-ENTRY @end format -@end ifnottex +@end ifinfo @c @setchapternewpage odd @setchapternewpage off @@ -28,11 +28,11 @@ END-INFO-DIR-ENTRY @iftex @set CHAPTER chapter @end iftex -@ifnottex +@ifinfo @set CHAPTER node -@end ifnottex +@end ifinfo -@ifnottex +@ifinfo GNU Coding Standards Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -43,7 +43,7 @@ with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''. -@end ifnottex +@end ifinfo @titlepage @title GNU Coding Standards @@ -63,12 +63,12 @@ A copy of the license is included in the section entitled ``GNU Free Documentation License''. @end titlepage -@ifnottex +@ifinfo @node Top, Preface, (dir), (dir) @top Version Last updated @value{lastupdate}. -@end ifnottex +@end ifinfo @menu * Preface:: About the GNU Coding Standards |