From 9a4409c6f3af3dc454ee3678c7ff28e5a383b6be Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Sep 2003 11:25:03 +0000 Subject: 2003-09-22 Ralf Corsepius * Makefile.am: Merger from rtems-4-6-branch. --- doc/tools/texi2www/ChangeLog | 4 ++++ doc/tools/texi2www/Makefile.am | 3 +-- doc/user/ChangeLog | 4 ++++ doc/user/Makefile.am | 3 +-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/tools/texi2www/ChangeLog b/doc/tools/texi2www/ChangeLog index 3200d20ded..7b4eca844b 100644 --- a/doc/tools/texi2www/ChangeLog +++ b/doc/tools/texi2www/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-05-21 Ralf Corsepius * texi2www: Add support for @ifnottex. diff --git a/doc/tools/texi2www/Makefile.am b/doc/tools/texi2www/Makefile.am index 9679f6161b..d23120769a 100644 --- a/doc/tools/texi2www/Makefile.am +++ b/doc/tools/texi2www/Makefile.am @@ -10,8 +10,7 @@ noinst_SCRIPTS = texi2www texi2dvi EXTRA_DIST = $(noinst_SCRIPTS) dir-arrow.gif prev-arrow.gif \ - missing-arrow.gif up-arrow.gif next-arrow.gif texi2www.texi \ - archive/texi2www-960103.tgz + missing-arrow.gif up-arrow.gif next-arrow.gif texi2www.texi PROJECT = texi2www diff --git a/doc/user/ChangeLog b/doc/user/ChangeLog index 67f17dceef..53b22e49b6 100644 --- a/doc/user/ChangeLog +++ b/doc/user/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * c_user.texi, fatal.t, preface.texi, rtmon.t: Merge from branch. diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am index 9eb83d2087..1d9a3f854b 100644 --- a/doc/user/Makefile.am +++ b/doc/user/Makefile.am @@ -20,8 +20,7 @@ GENERATED_FILES = overview.texi concepts.texi datatypes.texi init.texi \ signal.texi part.texi region.texi dpmem.texi io.texi fatal.texi \ schedule.texi rtmon.texi bsp.texi userext.texi conf.texi mp.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi info_TEXINFOS = c_user.texi c_user_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) -- cgit v1.2.3