diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-22 09:10:42 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-22 09:10:42 +0000 |
| commit | bcdaffdf50895c349fd3fd6a702c2ac481ba7177 (patch) | |
| tree | 233c6eda15548c65dfa574f3faecb064ba7bfc00 /doc/develenv | |
| parent | 2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-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/develenv')
| -rw-r--r-- | doc/develenv/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/develenv/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/develenv/ChangeLog b/doc/develenv/ChangeLog index 6ccbeb39d3..253c6c9155 100644 --- a/doc/develenv/ChangeLog +++ b/doc/develenv/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> * develenv.texi, direct.t, sample.t, utils.t: Merge from branch. diff --git a/doc/develenv/Makefile.am b/doc/develenv/Makefile.am index 1a97d72370..bc55043ec5 100644 --- a/doc/develenv/Makefile.am +++ b/doc/develenv/Makefile.am @@ -17,8 +17,7 @@ FILES = direct.texi intro.texi sample.texi utils.texi GENERATED_FILES = direct.texi sample.texi utils.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi info_TEXINFOS = develenv.texi develenv_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) |