2002-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* .cvsignore: Reworked.
	* Makefile.am: Remove texinfo/texinfo.tex
	* bootstrap: Removed.
	* configure.ac: Add pkgdocdir. Let htmldir be rooted at pkgdocdir.
	* main.am: Remove TEXINFO_TEX.
	* project.am: Let dvidir, psdir, pdfdir be rooted at pkgdocdir.
	Remove commented out make-variables.

doc/.cvsignore

@@ -1,2 +1,16 @@
 Makefile
 Makefile.in
+aclocal.m4
+autom4te.cache
+config.*
+configure
+depcomp
+index.html
+install-sh
+mdate-sh
+missing
+mkinstalldirs
+rtems_footer.html
+rtems_header.html
+rtems_support.html
+texinfo.tex

doc/ChangeLog

@@ -1,3 +1,13 @@
+2002-01-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* .cvsignore: Reworked.
+	* Makefile.am: Remove texinfo/texinfo.tex
+	* bootstrap: Removed.
+	* configure.ac: Add pkgdocdir. Let htmldir be rooted at pkgdocdir.
+	* main.am: Remove TEXINFO_TEX.
+	* project.am: Let dvidir, psdir, pdfdir be rooted at pkgdocdir.
+	Remove commented out make-variables.
+
 2002-01-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* .cvsignore: Add autom4te.cache, install-sh, mdate-sh, missing,

doc/Makefile.am

@@ -20,6 +20,6 @@ AUTOMAKE_FILES = project.am main.am
 
 noinst_SCRIPTS = bootstrap
 
-EXTRA_DIST = $(AUTOMAKE_FILES) HELP.html texinfo/texinfo.tex \
+EXTRA_DIST = $(AUTOMAKE_FILES) HELP.html \
     $(noinst_SCRIPTS) rtems_header.html.in rtems_footer.html.in
 

doc/configure.ac

@@ -64,7 +64,10 @@ esac],
 [papersize=]
 )
 
-htmldir='$(pkgdatadir)/html'
+pkgdocdir="\$(datadir)/rtems"
+AC_SUBST(pkgdocdir)
+
+htmldir="\$(pkgdocdir)/html"
 AC_SUBST(htmldir)
 
 dnl Checks for programs.

doc/main.am

@@ -1,4 +1,3 @@
-TEXINFO_TEX = ../texinfo/texinfo.tex
 AM_MAKEINFOFLAGS = -I ..
 
 html_projectdir = $(htmldir)/$(PROJECT)

doc/project.am

@@ -10,18 +10,15 @@ MAINTAINERCLEANFILES += $(PROJECT) $(PROJECT)-[0-9] $(PROJECT)-[0-9][0-9]
 MAINTAINERCLEANFILES += $(GENERATED_FILES)
 
 ## DVI support
-dvidir = $(pkgdatadir)/dvi
-## dvi_projectdir = $(dvidir)/$(PROJECT)
+dvidir = $(pkgdocdir)/dvi
 
 ## PS support
-psdir = $(pkgdatadir)/ps
-## ps_projectdir = $(psdir)/$(PROJECT)
+psdir = $(pkgdocdir)/ps
 
 ## PDF support
 SUFFIXES += .pdf
 
-pdfdir = $(pkgdatadir)/pdf
-## pdf_projectdir = $(pdfdir)/$(PROJECT)
+pdfdir = $(pkgdocdir)/pdf
 
 SUFFIXES += .eps
 

doc/texinfo/ChangeLog

@@ -1,3 +0,0 @@
-2000-08-10	Joel Sherrill <joel@OARcorp.com>
-
-	* ChangeLog: New file.