diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-08-07 05:17:27 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-08-07 05:17:27 +0000 |
| commit | 8e7cdc8b10ab915d1ffab70dfdcd8b3ea2088bac (patch) | |
| tree | 1107187ec5cb624486c74d3c53ca5aeb32168de8 | |
| parent | Merger from rtems-4-6-branch (diff) | |
| download | rtems-8e7cdc8b10ab915d1ffab70dfdcd8b3ea2088bac.tar.bz2 | |
Merger from rtems-4-6-branch
| -rw-r--r-- | doc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/configure.ac | 18 | ||||
| -rw-r--r-- | doc/project.am | 2 |
3 files changed, 11 insertions, 13 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index ee281e979e..de92d900c7 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -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. diff --git a/doc/configure.ac b/doc/configure.ac index bd8094eb78..213352fe65 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -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, diff --git a/doc/project.am b/doc/project.am index 5ba13027be..a84627507f 100644 --- a/doc/project.am +++ b/doc/project.am @@ -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) |