From 53b5b48c65b50b388c778802ee036f5a25c1481e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 30 Aug 2003 05:11:15 +0000 Subject: [PATCH] 2003-08-30 Ralf Corsepius * acinclude.m4: New. * common/rtems.texi.in: New. * configure.ac: Reflect changes above. * project.am: Add COMMON_FILES. Add rules to build common/rtems.texi. --- doc/ChangeLog | 8 ++++++++ doc/acinclude.m4 | 18 ++++++++++++++++++ doc/common/rtems.texi.in | 16 ++++++++++++++++ doc/configure.ac | 25 +++++++++++++------------ doc/project.am | 7 +++++++ 5 files changed, 62 insertions(+), 12 deletions(-) create mode 100644 doc/acinclude.m4 create mode 100644 doc/common/rtems.texi.in diff --git a/doc/ChangeLog b/doc/ChangeLog index e17c7a4a3f..f16938d846 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +2003-08-30 Ralf Corsepius + + * acinclude.m4: New. + * common/rtems.texi.in: New. + * configure.ac: Reflect changes above. + * project.am: Add COMMON_FILES. + Add rules to build common/rtems.texi. + 2003-08-29 Joel Sherrill * HELP.html, index.html.in, rtems_footer.html.in, rtems_header.html.in, diff --git a/doc/acinclude.m4 b/doc/acinclude.m4 new file mode 100644 index 0000000000..219d8042ab --- /dev/null +++ b/doc/acinclude.m4 @@ -0,0 +1,18 @@ +## _RTEMS_UPDATE_CONDITIONAL(FINAL,TMP) +AC_DEFUN([_RTEMS_UPDATE_CONDITIONAL],[ + AS_IF([test -f $1],[ + AS_IF([cmp -s $1 $2 2>/dev/null], + [ + AC_MSG_NOTICE([$1 is unchanged]) + rm -f $$2 + ],[ + AC_MSG_NOTICE([creating $1]) + rm -f $1 + mv $2 $1 + ]) + ],[ + AC_MSG_NOTICE([creating $1]) + rm -f $1 + mv $2 $1 + ]) +]) diff --git a/doc/common/rtems.texi.in b/doc/common/rtems.texi.in new file mode 100644 index 0000000000..6c50bb4e7e --- /dev/null +++ b/doc/common/rtems.texi.in @@ -0,0 +1,16 @@ +@c +@c $Id$ +@c + +@set RTEMSHTTPSITE www.rtems.com +@set RTEMSUSERS rtems-users@@rtems.com +@set RTEMSUSERSSUBSCRIBE rtems-users-subscribe@@rtems.com +@set RTEMSSNAPSHOTS rtems-snapshots@@rtems.com +@set RTEMSSNAPSHOTSSUBSCRIBE rtems-snapshots-subscribe@@rtems.com +@set RTEMSBUGS rtems-bugs@@rtems.com +@set RTEMSFTPURL ftp://www.rtems.com +@set RTEMSHTTPURL http://www.rtems.com +@set RTEMSGNATS @value{RTEMSHTTPURL}/cgi-bin/gnatsweb.pl +@set RTEMSPREFIX @RTEMSPREFIX@ +@set RTEMSAPI @RTEMSAPI@ + diff --git a/doc/configure.ac b/doc/configure.ac index 1d61cf1e29..bf567ffcdd 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE([no-define foreign 1.7.2]) AM_MAINTAINER_MODE AC_ARG_ENABLE(html, -[ --disable-html disable html support ], +[ --disable-html disable html support ], [case $enableval in yes) ;; no) ;; @@ -161,7 +161,17 @@ AS_IF([test -z "$gdb_patch_version"], AC_CONFIG_SUBDIRS(tools) -AC_CONFIG_FILES([Makefile +AC_CONFIG_FILES([Makefile],[],[ +test -d common || mkdir common +cat << EOF > common/rtems.sed~ +:t +s/@RTEMSAPI@/RTEMS_API/;t t +s,@RTEMSPREFIX@,$prefix,;t t +EOF +_RTEMS_UPDATE_CONDITIONAL([common/rtems.sed],[common/rtems.sed~]) +]) + +AC_CONFIG_FILES([ rtems_support.html index.html FAQ/Makefile @@ -185,16 +195,7 @@ s/@GCCRPMRELEASE@/$gcc3newlib_rpm_release/;t t s/@BINUTILSRPMRELEASE@/$binutils_rpm_release/;t t s/@GDBRPMRELEASE@/$gdb_rpm_release/;t t EOF - AS_IF([test -f started/tversions.sed],[ - AS_IF([cmp -s started/tversions.sed started/tversions.sed~ 2>/dev/null], - [AC_MSG_NOTICE([started/tversions.sed is unchanged]) - rm -f $started/tversions.sed~], - [AC_MSG_NOTICE([creating started/tversions.sed]) - rm -f started/tversions.sed - mv started/tversions.sed~ started/tversions.sed])],[ - AC_MSG_NOTICE([creating started/tversions.sed]) - rm -f started/tversions.sed - mv started/tversions.sed~ started/tversions.sed]) +_RTEMS_UPDATE_CONDITIONAL([started/tversions.sed],[started/tversions.sed~]) ]) AC_CONFIG_FILES([ diff --git a/doc/project.am b/doc/project.am index a84627507f..e2409cdbfd 100644 --- a/doc/project.am +++ b/doc/project.am @@ -78,3 +78,10 @@ endif # USE_PS if USE_PDF pdf_DATA = $(PROJECT).pdf endif + +COMMON_FILES = $(top_srcdir)/common/setup.texi +COMMON_FILES += $(top_builddir)/common/rtems.texi + +$(top_builddir)/common/rtems.texi: $(top_srcdir)/common/rtems.texi.in $(top_builddir)/common/rtems.sed + sed -f $(top_builddir)/common/rtems.sed \ + $(top_srcdir)/common/rtems.texi.in > $(top_builddir)/common/rtems.texi