From e90e428e145251b72b6e0ea85444815f4ed80add Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 14 Jun 2000 14:25:49 +0000 Subject: Patch rtemsdoc-4.5.0-rc-13-cvs.diff.gz from Ralf Corsepius which: * should fix the building rtemsdoc outside of the sourcetree with relative srcdir issue * adds --enable-papersize=[letter|a4|] --- doc/FAQ/FAQ.texi | 1 - doc/ada_user/ada_user.texi | 1 - doc/bsp_howto/bsp_howto.texi | 1 - doc/common/setup.texi | 4 ++-- doc/configure.in | 30 ++++++++++++++++++++++++++-- doc/develenv/develenv.texi | 1 - doc/filesystem/filesystem.texi | 1 - doc/itron3.0/itron.texi | 1 - doc/networking/networking.texi | 1 - doc/new_chapters/new_chapters.texi | 1 - doc/porting/porting.texi | 1 - doc/posix1003.1/posix1003_1.texi | 1 - doc/posix_users/posix_users.texi | 1 - doc/project.am | 7 ++++--- doc/relnotes/relnotes.texi | 1 - doc/rgdb_specs/rgdb_specs.texi | 1 - doc/rtems_gdb/rtems_gdb.texi | 1 - doc/started/started.texi | 3 +-- doc/started_ada/started_ada.texi | 1 - doc/supplements/hppa1_1/hppa1_1.texi | 1 - doc/supplements/i386/i386.texi | 1 - doc/supplements/i960/i960.texi | 1 - doc/supplements/m68k/m68k.texi | 1 - doc/supplements/mips64orion/mips64orion.texi | 1 - doc/supplements/powerpc/powerpc.texi | 1 - doc/supplements/sh/sh.texi | 1 - doc/supplements/sparc/sparc.texi | 1 - doc/supplements/supplement.am | 3 +++ doc/supplements/template/template.texi | 1 - doc/user/c_user.texi | 1 - 30 files changed, 38 insertions(+), 34 deletions(-) diff --git a/doc/FAQ/FAQ.texi b/doc/FAQ/FAQ.texi index 55879e90d3..9d55971472 100644 --- a/doc/FAQ/FAQ.texi +++ b/doc/FAQ/FAQ.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/ada_user/ada_user.texi b/doc/ada_user/ada_user.texi index d9a1c5d42d..5681a91034 100644 --- a/doc/ada_user/ada_user.texi +++ b/doc/ada_user/ada_user.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/bsp_howto/bsp_howto.texi b/doc/bsp_howto/bsp_howto.texi index 32431c59c6..a4149e499a 100644 --- a/doc/bsp_howto/bsp_howto.texi +++ b/doc/bsp_howto/bsp_howto.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/common/setup.texi b/doc/common/setup.texi index bbb0600dc9..59e80a98ff 100644 --- a/doc/common/setup.texi +++ b/doc/common/setup.texi @@ -13,8 +13,8 @@ @c @set use-ascii -@clear use-html -@clear use-tex +@c @clear use-html +@c @clear use-tex @iftex @clear use-ascii diff --git a/doc/configure.in b/doc/configure.in index 6426b1880c..7087ec0873 100644 --- a/doc/configure.in +++ b/doc/configure.in @@ -49,6 +49,19 @@ esac], [enable_ps="yes"] ) +AC_ARG_ENABLE(papersize, +[ --enable-papersize=[letter|a4|] set papersize [default:system defaults]], +[case $enableval in +a4) papersize=a4 ;; +letter) papersize=letter ;; +yes) papersize= ;; +no) papersize= ;; +*) AC_MSG_ERROR([Invalid papersize]) +;; +esac], +[papersize=] +) + htmldir='$(pkgdatadir)/html' AC_SUBST(htmldir) @@ -63,10 +76,8 @@ AC_SUBST(TEXI2WWW) AC_CHECK_PROGS(GS,gs) AM_CONDITIONAL(GS,test x"$GS" != x"") -# TEXI2DVI='$(PERL) $(top_srcdir)/tools/texi2www/texi2dvi' AC_CHECK_PROGS(TEXI2DVI,texi2dvi) AM_CONDITIONAL(TEXI2DVI,test x"$TEXI2DVI" != x"") - if test "$enable_pdf" = "yes"; then AC_CHECK_PROGS(EPSTOPDF,epstopdf) AM_CONDITIONAL(EPSTOPDF,test x"$EPSTOPDF" != x"") @@ -92,6 +103,21 @@ AM_CONDITIONAL(USE_PDF, && test x"$TEXI2DVI" != x"" \ && test x"$TEXI2PDF" != x"" ) +case $papersize in +a4) + TEXI2DVI="${TEXI2DVI} --texinfo=@afourpaper" + TEXI2PDF="${TEXI2PDF} --texinfo=@afourpaper" + DVIPS="dvips -t a4" +;; +letter) + DVIPS="dvips -t letter" + ;; +*) + DVIPS="dvips" +;; +esac +AC_SUBST(DVIPS) + BMENU2='$(top_builddir)/tools/bmenu/bmenu2' AC_SUBST(BMENU2) diff --git a/doc/develenv/develenv.texi b/doc/develenv/develenv.texi index 914b40859d..131487a146 100644 --- a/doc/develenv/develenv.texi +++ b/doc/develenv/develenv.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/filesystem/filesystem.texi b/doc/filesystem/filesystem.texi index 78ef89dafc..ac61f55b27 100644 --- a/doc/filesystem/filesystem.texi +++ b/doc/filesystem/filesystem.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/itron3.0/itron.texi b/doc/itron3.0/itron.texi index e908559142..b9d23e06c2 100644 --- a/doc/itron3.0/itron.texi +++ b/doc/itron3.0/itron.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/networking/networking.texi b/doc/networking/networking.texi index abc33cc14a..f5f40f2146 100644 --- a/doc/networking/networking.texi +++ b/doc/networking/networking.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/new_chapters/new_chapters.texi b/doc/new_chapters/new_chapters.texi index 779fd8c675..058df694e8 100644 --- a/doc/new_chapters/new_chapters.texi +++ b/doc/new_chapters/new_chapters.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/porting/porting.texi b/doc/porting/porting.texi index 5d5aefa7e4..8a88729eb6 100644 --- a/doc/porting/porting.texi +++ b/doc/porting/porting.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/posix1003.1/posix1003_1.texi b/doc/posix1003.1/posix1003_1.texi index 9fb3da5a7a..621967007d 100644 --- a/doc/posix1003.1/posix1003_1.texi +++ b/doc/posix1003.1/posix1003_1.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/posix_users/posix_users.texi b/doc/posix_users/posix_users.texi index 8b687d15a0..39642b02bb 100644 --- a/doc/posix_users/posix_users.texi +++ b/doc/posix_users/posix_users.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/project.am b/doc/project.am index a624b55bc0..e74e55f1f3 100644 --- a/doc/project.am +++ b/doc/project.am @@ -3,13 +3,14 @@ SUFFIXES += .t ## Texinfo support -TEXINFO_TEX = $(top_srcdir)/texinfo/texinfo.tex +TEXINFO_TEX = ../texinfo/texinfo.tex TEXINPUTS = $(srcdir):$(top_srcdir) +TEXI_COMMON = -I .. .texi: @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) -I $(top_srcdir) `echo $< | sed 's,.*/,,'` + cd $(srcdir) && \ + $(MAKEINFO) $(TEXI_COMMON) `echo $< | sed 's,.*/,,'` $(srcdir)/stamp-vti: $(PROJECT).texi $(top_srcdir)/configure.in @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh \ diff --git a/doc/relnotes/relnotes.texi b/doc/relnotes/relnotes.texi index 77ec3af26a..d2da9a5441 100644 --- a/doc/relnotes/relnotes.texi +++ b/doc/relnotes/relnotes.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/rgdb_specs/rgdb_specs.texi b/doc/rgdb_specs/rgdb_specs.texi index 4fe64ae6cb..b549fa174a 100644 --- a/doc/rgdb_specs/rgdb_specs.texi +++ b/doc/rgdb_specs/rgdb_specs.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/rtems_gdb/rtems_gdb.texi b/doc/rtems_gdb/rtems_gdb.texi index fb94e48cf6..a03a337c87 100644 --- a/doc/rtems_gdb/rtems_gdb.texi +++ b/doc/rtems_gdb/rtems_gdb.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/started/started.texi b/doc/started/started.texi index c9afd61228..17516cc21d 100644 --- a/doc/started/started.texi +++ b/doc/started/started.texi @@ -3,8 +3,7 @@ @setfilename started @syncodeindex vr fn @synindex ky cp -@paragraphindent 0 -@c @smallbook +@c @paragraphindent 0 @c %**end of header @c diff --git a/doc/started_ada/started_ada.texi b/doc/started_ada/started_ada.texi index 4a304a082c..ef93148df6 100644 --- a/doc/started_ada/started_ada.texi +++ b/doc/started_ada/started_ada.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/supplements/hppa1_1/hppa1_1.texi b/doc/supplements/hppa1_1/hppa1_1.texi index 3ad11c6f85..d20897aea3 100644 --- a/doc/supplements/hppa1_1/hppa1_1.texi +++ b/doc/supplements/hppa1_1/hppa1_1.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/supplements/i386/i386.texi b/doc/supplements/i386/i386.texi index f2af885e73..09090933fc 100644 --- a/doc/supplements/i386/i386.texi +++ b/doc/supplements/i386/i386.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/supplements/i960/i960.texi b/doc/supplements/i960/i960.texi index 10119c6114..2b74590f55 100644 --- a/doc/supplements/i960/i960.texi +++ b/doc/supplements/i960/i960.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/supplements/m68k/m68k.texi b/doc/supplements/m68k/m68k.texi index 255b8aa9cc..2550777a21 100644 --- a/doc/supplements/m68k/m68k.texi +++ b/doc/supplements/m68k/m68k.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/supplements/mips64orion/mips64orion.texi b/doc/supplements/mips64orion/mips64orion.texi index 33218ec47e..7a09d0ec2d 100644 --- a/doc/supplements/mips64orion/mips64orion.texi +++ b/doc/supplements/mips64orion/mips64orion.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/supplements/powerpc/powerpc.texi b/doc/supplements/powerpc/powerpc.texi index 552db3a2b5..e339f29235 100644 --- a/doc/supplements/powerpc/powerpc.texi +++ b/doc/supplements/powerpc/powerpc.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/supplements/sh/sh.texi b/doc/supplements/sh/sh.texi index 22b8b2974d..f3721cb087 100644 --- a/doc/supplements/sh/sh.texi +++ b/doc/supplements/sh/sh.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/supplements/sparc/sparc.texi b/doc/supplements/sparc/sparc.texi index 4297d4c9a8..f337efd523 100644 --- a/doc/supplements/sparc/sparc.texi +++ b/doc/supplements/sparc/sparc.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/supplements/supplement.am b/doc/supplements/supplement.am index e2c3905556..bc9b442a97 100644 --- a/doc/supplements/supplement.am +++ b/doc/supplements/supplement.am @@ -6,6 +6,9 @@ REPLACE2 = $(PERL) $(top_srcdir)/tools/word-replace2 +TEXINFO_TEX = ../../texinfo/texinfo.tex +TEXI_COMMON = -I ../.. + MAINTAINERCLEANFILES += $(GENERATED_FILES) html_projectdir = $(htmldir)/supplements/$(PROJECT) diff --git a/doc/supplements/template/template.texi b/doc/supplements/template/template.texi index 92b83a9228..572199df87 100644 --- a/doc/supplements/template/template.texi +++ b/doc/supplements/template/template.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c diff --git a/doc/user/c_user.texi b/doc/user/c_user.texi index dadf679aa1..5f73f02300 100644 --- a/doc/user/c_user.texi +++ b/doc/user/c_user.texi @@ -4,7 +4,6 @@ @syncodeindex vr fn @synindex ky cp @paragraphindent 0 -@c @smallbook @c %**end of header @c -- cgit v1.2.3