summaryrefslogtreecommitdiffstats
path: root/doc/posix_users
diff options
context:
space:
mode:
Diffstat (limited to 'doc/posix_users')
-rw-r--r--doc/posix_users/ChangeLog4
-rw-r--r--doc/posix_users/Makefile.am3
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/posix_users/ChangeLog b/doc/posix_users/ChangeLog
index 9cace236f2..ef1dfd02c0 100644
--- a/doc/posix_users/ChangeLog
+++ b/doc/posix_users/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>
* posix_users.texi: Merge from branch.
diff --git a/doc/posix_users/Makefile.am b/doc/posix_users/Makefile.am
index e4d6dd1185..0a7db36a78 100644
--- a/doc/posix_users/Makefile.am
+++ b/doc/posix_users/Makefile.am
@@ -19,8 +19,7 @@ GENERATED_FILES = cancel.texi clock.texi cond.texi cspecific.texi \
signal.texi status.texi systemdb.texi thread.texi timer.texi libc.texi \
libm.texi
-COMMON_FILES = $(top_srcdir)/common/setup.texi \
- $(top_srcdir)/common/cpright.texi
+COMMON_FILES += $(top_srcdir)/common/cpright.texi
FILES = preface.texi
info_TEXINFOS = posix_users.texi