Merger from rtems-4-6-branch

This commit is contained in:
Ralf Corsepius
2003-08-07 05:17:27 +00:00
parent 6b5a7b501d
commit 8e7cdc8b10
3 changed files with 11 additions and 13 deletions

View File

@@ -2,10 +2,6 @@
* index.html.in: Development Environment Guide should be updated now.
2003-04-11 Joel Sherrill <joel@OARcorp.com>
* index.html.in: Development Environment Guide should be updated now.
2003-02-18 Joel Sherrill <joel@OARcorp.com>
* Makefile.am, configure.ac: Remove src2html references.

View File

@@ -5,7 +5,6 @@ AC_PREREQ(2.57)
AC_INIT([rtems-doc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([project.am])
RTEMS_TOP([..])
AC_CONFIG_AUX_DIR([..])
AM_INIT_AUTOMAKE([no-define foreign 1.7.2])
AM_MAINTAINER_MODE
@@ -82,16 +81,19 @@ AM_CONDITIONAL(GS,test x"$GS" != x"")
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"")
AC_CHECK_PROGS(TEXI2PDF,texi2pdf)
AM_CONDITIONAL(TEXI2PDF,test x"$TEXI2PDF" != x"")
fi
AC_CHECK_PROGS(EPSTOPDF,epstopdf)
AM_CONDITIONAL(EPSTOPDF,
test "$enable_pdf" = "yes" \
&& test x"$EPSTOPDF" != x"" )
AC_CHECK_PROGS(TEXI2PDF,texi2pdf)
AM_CONDITIONAL(TEXI2PDF,
test "$enable_pdf" = "yes" \
&& test x"$TEXI2PDF" != x"")
AM_CONDITIONAL(USE_HTML,
test "$enable_html" = "yes" \
test "$enable_html" = "yes" \
&& test x"PERL" != x"" )
AM_CONDITIONAL(USE_DVI,

View File

@@ -8,7 +8,7 @@ SUFFIXES = .t
MAINTAINERCLEANFILES =
CLEANFILES =
MOSTLYCLEANFILES =
CLEANFILES += $(PROJECT) $(PROJECT)-[0-9] $(PROJECT)-[0-9][0-9]
CLEANFILES += $(PROJECT).info $(PROJECT).info-[0-9] $(PROJECT).info-[0-9][0-9]
CLEANFILES += $(GENERATED_FILES)
AM_MAKEINFOFLAGS = -I $(top_builddir) -I $(top_srcdir)