From f28a6af24cf469725a76a22820d00ebe1f466363 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 24 Jan 2003 11:16:35 +0000
Subject: 2003-01-24	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* main.am: Remove AM_MAKEINFOFLAGS, TEXI2DVI, TEXI2PDF.
	Append -I $(top_builddir) to TEXI2WWW_ARGS.
	* project.am: Add AM_MAKEINFOFLAGS, TEXI2DVI, TEXI2PDF.
	Override automake's .dvi.ps:-rule.
---
 doc/ChangeLog  |  7 +++++++
 doc/main.am    |  5 +----
 doc/project.am | 13 ++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 29ce33f4d7..0b4a8c62ad 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-24	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* main.am: Remove AM_MAKEINFOFLAGS, TEXI2DVI, TEXI2PDF.
+	Append -I $(top_builddir) to TEXI2WWW_ARGS.
+	* project.am: Add AM_MAKEINFOFLAGS, TEXI2DVI, TEXI2PDF.
+	Override automake's .dvi.ps:-rule.
+
 2003-01-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* project.am, main.am: Use automake rules to build ps, pdf, info.
diff --git a/doc/main.am b/doc/main.am
index 24ad285c11..b5dde0910c 100644
--- a/doc/main.am
+++ b/doc/main.am
@@ -1,11 +1,8 @@
-AM_MAKEINFOFLAGS = -I $(top_builddir) -I $(top_srcdir)
-TEXI2DVI = @TEXI2DVI@ -I $(top_builddir) -I $(top_srcdir)
-TEXI2PDF = @TEXI2PDF@ -I $(top_builddir) -I $(top_srcdir)
 
 html_projectdir = $(htmldir)/$(PROJECT)
 
 TEXI2WWW_ARGS=\
--I $(srcdir) -I $(top_srcdir) \
+-I $(srcdir) -I $(top_srcdir) -I $(top_builddir) \
 -dirfile ../index.html \
 -header rtems_header.html \
 -footer rtems_footer.html \
diff --git a/doc/project.am b/doc/project.am
index 6f27b375ff..93620b4f94 100644
--- a/doc/project.am
+++ b/doc/project.am
@@ -1,6 +1,8 @@
 ## $Id$
 
+# HACK: makeinfo is locale sensitive 
 LANG=C
+
 SUFFIXES = .t
 
 MAINTAINERCLEANFILES =
@@ -9,6 +11,16 @@ MOSTLYCLEANFILES =
 CLEANFILES += $(PROJECT) $(PROJECT)-[0-9] $(PROJECT)-[0-9][0-9]
 CLEANFILES += $(GENERATED_FILES)
 
+AM_MAKEINFOFLAGS = -I $(top_builddir) -I $(top_srcdir)
+TEXI2DVI = @TEXI2DVI@ -I $(top_builddir) -I $(top_srcdir)
+TEXI2PDF = @TEXI2PDF@ -I $(top_builddir) -I $(top_srcdir)
+
+# Without $(srcdir) in TEXINPUTS, dvips doesn't find the *.eps
+# we distribute in $(srcdir)
+.dvi.ps:
+	TEXINPUTS="$(srcdir)${PATH_SEPARATOR}$$TEXINPUTS" \
+	$(DVIPS) -o $@ $<
+
 ## DVI support
 dvidir = $(pkgdocdir)/dvi
 
@@ -60,7 +72,6 @@ if USE_PS
 ps_DATA = $(PROJECT).ps
 endif # USE_PS
 
-
 if USE_PDF
 pdf_DATA = $(PROJECT).pdf
 endif
-- 
cgit v1.2.3