diff options
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/user/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
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 <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill <joel@OARcorp.com> * 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) |