summaryrefslogtreecommitdiffstats
path: root/doc/porting
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-09-22 09:10:42 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-09-22 09:10:42 +0000
commitbcdaffdf50895c349fd3fd6a702c2ac481ba7177 (patch)
tree233c6eda15548c65dfa574f3faecb064ba7bfc00 /doc/porting
parent24dd0fb438a3529ce7bb47ef78ab3a91dd4ef004 (diff)
downloadrtems-bcdaffdf50895c349fd3fd6a702c2ac481ba7177.tar.bz2
2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merger from rtems-4-6-branch.
Diffstat (limited to 'doc/porting')
-rw-r--r--doc/porting/ChangeLog4
-rw-r--r--doc/porting/Makefile.am3
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/porting/ChangeLog b/doc/porting/ChangeLog
index 16a17809af..02a610461e 100644
--- a/doc/porting/ChangeLog
+++ b/doc/porting/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>
* porting.texi: Merge from branch.
diff --git a/doc/porting/Makefile.am b/doc/porting/Makefile.am
index b01b151f1b..77c42bf03e 100644
--- a/doc/porting/Makefile.am
+++ b/doc/porting/Makefile.am
@@ -21,8 +21,7 @@ GENERATED_FILES = developtools.texi sourcecode.texi cpumodels.texi \
cpuinit.texi interrupts.texi taskcontext.texi idlethread.texi \
prioritybitmap.texi codetuning.texi miscellaneous.texi
-COMMON_FILES = $(top_srcdir)/common/setup.texi \
- $(top_srcdir)/common/cpright.texi
+COMMON_FILES += $(top_srcdir)/common/cpright.texi
info_TEXINFOS = porting.texi
porting_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)