Patch rtemsdoc-4.5.0-rc-13-cvs.diff.gz from Ralf Corsepius

<corsepiu@faw.uni-ulm.de> which: * should fix the building rtemsdoc outside of the sourcetree with relative srcdir issue * adds --enable-papersize=[letter|a4|]
2000-06-14 14:25:49 +00:00
parent fdcb2b52b7
commit e90e428e14
30 changed files with 38 additions and 34 deletions
--- 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
--- 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
--- 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
--- 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
--- 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)

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 \
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)

--- 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
--- 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