2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* rtemsdoc/Makefile.am: Use $(top_builddir)/common/common.add,
	$(top_builddir)/common/clean.add, header.add.
	Generate rtemsdoc.spec.in.
	* rtemsdoc/mkspec.in: Remove exe_ext.
	* rtemsdoc/rtemsdoc.spec.in: Remove.
	* gccnewlib/Makefile.am:  Use $(top_builddir)/common/common.add,
        $(top_builddir)/common/clean.add, header.add.
	* gccnewlib/base-gcc.m4: Replace @exe_ext@ with %{_exeext}.
	* gccnewlib/base-gcj.add: Replace @exe_ext@ with %{_exeext}.
	* gccnewlib/gccnewlib.add: Replace @exe_ext@ with %{_exeext}.
	Remove header, broken cdn-X configuration, %clean.
	* gccnewlib/target-g77.add: Replace @exe_ext@ with %{_exeext}.
	* gccnewlib/target-gcc.add: Replace @exe_ext@ with %{_exeext}.
	* gccnewlib/target-gcj.add: Replace @exe_ext@ with %{_exeext}.
	* gccnewlib/target-objc.add: Replace @exe_ext@ with %{_exeext}.

3 files changed, 11 insertions, 105 deletions

diff --git a/scripts/rtemsdoc/Makefile.am b/scripts/rtemsdoc/Makefile.am
index 939fc85686..fd205e54e4 100644
--- a/scripts/rtemsdoc/Makefile.am
+++ b/scripts/rtemsdoc/Makefile.am
@@ -30,7 +30,11 @@ DOCS += networking porting new_chapters
 DOCS += relnotes rgdb_specs rtems_gdb
 DOCS += started started_ada
 
-SUBPACKAGES = $(DOCS:%=%-docs.add)
+SUBPACKAGES = header.add
+SUBPACKAGES += ../common/common.add
+SUBPACKAGES += rtemsdoc.add
+SUBPACKAGES += ../common/clean.add
+SUBPACKAGES += $(DOCS:%=%-docs.add)
 CLEANFILES  += $(DOCS:%=%-docs.add)
 SUBPACKAGES += $(SUPPLEMENTS:%=%-supplement.add)
 CLEANFILES  += $(SUPPLEMENTS:%=%-supplement.add)
@@ -45,9 +49,13 @@ SUFFIXES = -supplement.add -docs.add
 	t=`echo $@ | sed -e 's,-docs.add,,'`; \
 	sed -e s/@target\@/$$t/g < $< >$@ 
 
+rtemsdoc.spec.in: $(SUBPACKAGES)
+	cat $^ > $@
+CLEANFILES += rtemsdoc.spec.in
+
 rtemsdoc.spec: $(MKSPEC_DEPS) $(SUBPACKAGES)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . > $@
-	cat $(SUBPACKAGES) >> $@
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache > $@
+CLEANFILES += rtemsdoc.spec
 
 RPM_SPECS_DATA = rtemsdoc.spec
 
diff --git a/scripts/rtemsdoc/mkspec.in b/scripts/rtemsdoc/mkspec.in
index 52725bcc5a..132e5f1050 100644
--- a/scripts/rtemsdoc/mkspec.in
+++ b/scripts/rtemsdoc/mkspec.in
@@ -4,7 +4,6 @@ RTEMS_DIR=`dirname $0`/@top_srcdir@
 PACKAGE_BUGREPORT=@PACKAGE_BUGREPORT@
 
 CFG=../setup.cache
-exe_ext=@EXEEXT@
 
 usage()
 {
@@ -49,5 +48,4 @@ sed -e "s%@PACKAGE_BUGREPORT\@%@PACKAGE_BUGREPORT@%g" \
     -e "s%@rtems_version\@%${rtems_version}%g" \
     -e "s%@rtems_rpm_version\@%${rtems_rpm_version}%g" \
     -e "s,@rpm_build_root\@,${rpm_build_root},g" \
-    -e "s%@exe_ext\@%${exe_ext}%g" \
 < ${specsrc}
diff --git a/scripts/rtemsdoc/rtemsdoc.spec.in b/scripts/rtemsdoc/rtemsdoc.spec.in
deleted file mode 100644
index 903322677a..0000000000
--- a/scripts/rtemsdoc/rtemsdoc.spec.in
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# spec file for package rtemsdoc
-# 
-# Copyright  (c)  2003 Ralf Corsepius, Ulm, Germany
-#
-# please send bugfixes or comments to @PACKAGE_BUGREPORT@
-#
-
-%define _prefix	/opt/rtems
-%define _datadir %{_prefix}/share
-%define _infodir %{_datadir}/info
-
-%define srcvers	@rtems_version@
-%define rpmvers  %{expand:%%(echo @rtems_version@ | tr - _ )}
-
-
-Vendor:       OAR Corporation
-Distribution: Linux
-Name:         rtemsdoc
-Release:      @rtems_rpm_release@
-License:      Distributable
-Group:        rtems
-
-Autoreqprov:  on
-Packager:     	corsepiu@faw.uni-ulm.de and joel@OARcorp.com
-BuildPreReq:    texinfo >= 4.2
-BuildPreReq:    tetex
-BuildPreReq:    perl
-BuildPreReq:    gcc
-
-Version:      %{rpmvers}
-Summary:      A free operating system for embedded systems
-Source:       rtems-%{srcvers}.tar.bz2
-
-#
-# The original sources are not included in the source RPM.
-# If we included them, then the source RPMs for each target
-# would duplicate MBs of source unnecessarily.  This is 
-# a duplication of over 30 MBs of source for each of
-# the more than 10 targets it is possible to build.
-#
-# You can get them yourself from the Internet and copy them to
-# your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR).
-# Or you can try the ftp options of rpm :-)
-#
-NoSource:      0
-Prefix:		%{_prefix}
-Prefix:		%{_infodir}
-Prefix:		%{_datadir}
-BuildRoot:    	%{_tmppath}/%{name}-%{version}-root
-BuildArch:	noarch
-
-%description
-RTEMS is a free operating system for embedded systems.
-
-This package contains the documentation
-
-%prep
-%setup -c -T -n %{name}-%{version} -b0
-test -d build || mkdir build
-%build
-cd build
-# rtems does not support building inside the source tree
-  export PATH=%{_prefix}/bin:$PATH
-  ../rtems-%{srcvers}/doc/configure \
-  --prefix=%{_prefix} \
-  --infodir=%{_infodir} \
-  --datadir=%{_datadir} \
-  --enable-docs
-  make RTEMS_BSP=
-%install
-  rm -rf ${RPM_BUILD_ROOT}
-cd build
-  make RTEMS_BSP= DESTDIR=${RPM_BUILD_ROOT} install
-  rm -f ${RPM_BUILD_ROOT}/%{_infodir}/template*
-  rm -f ${RPM_BUILD_ROOT}/%{_datadir}/rtems/*/template*
-  rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/rtems/html/supplements/template*
-
-  gzip -9qf ${RPM_BUILD_ROOT}/%{_infodir}/*
-  bzip2 -9qf ${RPM_BUILD_ROOT}/%{_datadir}/rtems/ps/*
-
-## base
-
-%package base
-Summary: Documentation for RTEMS ada support
-Group: rtems/documentation
-
-%description base
-RTEMS is a free operating system for embedded systems.
-
-This package contains the files shared between different documentation
-packages.
-
-%files base
-%dir %{_infodir}
-%dir %{_datadir}/rtems
-%dir %{_datadir}/rtems/html
-%{_datadir}/rtems/html/images
-%{_datadir}/rtems/html/*.html
-