From bcdaffdf50895c349fd3fd6a702c2ac481ba7177 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Sep 2003 09:10:42 +0000 Subject: 2003-09-22 Ralf Corsepius * Makefile.am: Merger from rtems-4-6-branch. --- doc/posix1003.1/ChangeLog | 4 ++++ doc/posix1003.1/Makefile.am | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'doc/posix1003.1') diff --git a/doc/posix1003.1/ChangeLog b/doc/posix1003.1/ChangeLog index 0580e9237b..c393a7aece 100644 --- a/doc/posix1003.1/ChangeLog +++ b/doc/posix1003.1/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * ch07.t, posix1003_1.texi, preface.texi: Merge from branch. diff --git a/doc/posix1003.1/Makefile.am b/doc/posix1003.1/Makefile.am index 9d5412f4e3..1a73d4edf4 100644 --- a/doc/posix1003.1/Makefile.am +++ b/doc/posix1003.1/Makefile.am @@ -17,8 +17,7 @@ GENERATED_FILES = ch01.texi ch02.texi ch03.texi ch04.texi ch05.texi \ ch06.texi ch07.texi ch08.texi ch09.texi ch10.texi ch11.texi ch12.texi \ ch13.texi ch14.texi ch15.texi ch16.texi ch17.texi ch18.texi ch19.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = preface.texi -- cgit v1.2.3