2003-08-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* common/commom.am: New.
	* Makefile.am: Remove TEMPLATES.
	Put setup.cache into CONFIG_STATUS_DEPENDENCIES instead of
	CONFIGURE_DEPENDENCIES.
	* configure.ac: Remove AC_PREFIX_DEFAULT.
	* binutils/Makefile.am: include common.am.
	* common/common.add.in: Use rtems.com gnats.
	* cpukit/Makefile.am: include common.am.
	* gcc3newlib/Makefile.am: include common.am.
	* gccnewlib/Makefile.am: include common.am.
	* gdb/Makefile.am: include common.am.
	* rtems/Makefile.am: include common.am.
	* rtemsdoc/Makefile.am: include common.am.

12 files changed, 34 insertions, 6 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 07bd42c7d0..6079efaf53 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,19 @@
+2003-08-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* common/commom.am: New.
+	* Makefile.am: Remove TEMPLATES. 
+	Put setup.cache into CONFIG_STATUS_DEPENDENCIES instead of
+	CONFIGURE_DEPENDENCIES.
+	* configure.ac: Remove AC_PREFIX_DEFAULT.
+	* binutils/Makefile.am: include common.am.
+	* common/common.add.in: Use rtems.com gnats.
+	* cpukit/Makefile.am: include common.am.
+	* gcc3newlib/Makefile.am: include common.am.
+	* gccnewlib/Makefile.am: include common.am.
+	* gdb/Makefile.am: include common.am.
+	* rtems/Makefile.am: include common.am.
+	* rtemsdoc/Makefile.am: include common.am.
+
 2003-08-28	Joel Sherrill <joel@OARcorp.com>
 
 	* setup.def: Recovery effort.
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index d5226922a6..751f50a970 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -10,13 +10,11 @@ SUBDIRS += rtemsdoc
 noinst_SCRIPTS = setup buildall buildalltar mkbspspec \
     mkgccnewlibspec mkrpms mkspec
 
-TEMPLATES =
-
-noinst_DATA = setup.def $(TEMPLATES)
+noinst_DATA = setup.def
 
 EXTRA_DIST = $(noinst_DATA) $(noinst_SCRIPTS)
 
-CONFIGURE_DEPENDENCIES = setup.cache
+CONFIG_STATUS_DEPENDENCIES = setup.cache
 setup.cache: setup.def
 	cp setup.def $@
 
diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am
index aad90027a9..4a6aaea247 100644
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -2,6 +2,7 @@
 ## $Id$
 ##
 
+include $(top_srcdir)/common/common.am
 
 MKBINUTILSSPEC = $(SHELL) ./mkspec
 
diff --git a/scripts/common/common.add.in b/scripts/common/common.add.in
index 091c926b6d..e3580a6af8 100644
--- a/scripts/common/common.add.in
+++ b/scripts/common/common.add.in
@@ -1,6 +1,6 @@
 #
 # Please send bugfixes or comments to
-# 	http://www.oarcorp.com/cgi-bin/gnatweb.pl
+# 	http://www.rtems.com/cgi-bin/gnatweb.pl
 # or	mailto:@PACKAGE_BUGREPORT@
 #
 
diff --git a/scripts/common/common.am b/scripts/common/common.am
new file mode 100644
index 0000000000..a1c6b651a2
--- /dev/null
+++ b/scripts/common/common.am
@@ -0,0 +1,4 @@
+$(top_builddir)/common/common.add: $(top_builddir)/config.status $(top_srcdir)/common/common.add.in
+	cd $(top_builddir) && $(SHELL) ./config.status common/common.add
+$(top_builddir)/common/clean.add: $(top_builddir)/config.status $(top_srcdir)/common/clean.add.in
+	cd $(top_builddir) && $(SHELL) ./config.status common/clean.add
diff --git a/scripts/configure.ac b/scripts/configure.ac
index 69dd444026..8fc36d2ce0 100644
--- a/scripts/configure.ac
+++ b/scripts/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.57)
 AC_INIT([rtems-scripts],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
 AC_CONFIG_SRCDIR([binutils])
 RTEMS_TOP([..])
-AC_PREFIX_DEFAULT([/opt/rtems])
+
 AM_INIT_AUTOMAKE([no-define foreign 1.7.2])
 
 AC_CANONICAL_HOST
diff --git a/scripts/cpukit/Makefile.am b/scripts/cpukit/Makefile.am
index 03a95b87e3..04b71cf47d 100644
--- a/scripts/cpukit/Makefile.am
+++ b/scripts/cpukit/Makefile.am
@@ -2,6 +2,7 @@
 ## $Id$
 ##
 
+include $(top_srcdir)/common/common.am
 
 MKSPEC = $(SHELL) ./mkspec
 
diff --git a/scripts/gcc3newlib/Makefile.am b/scripts/gcc3newlib/Makefile.am
index 9e02b98fba..b1e68cfe26 100644
--- a/scripts/gcc3newlib/Makefile.am
+++ b/scripts/gcc3newlib/Makefile.am
@@ -2,6 +2,8 @@
 ## $Id$
 ##
 
+include $(top_srcdir)/common/common.am
+
 MKSPEC = $(SHELL) ./mkspec
 
 SUBPACKAGES = header.add
diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am
index 12f779bd02..6bf511022f 100644
--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -2,6 +2,7 @@
 ## $Id$
 ##
 
+include $(top_srcdir)/common/common.am
 
 MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec
 
diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am
index fd29ad67cc..f4d60a92ca 100644
--- a/scripts/gdb/Makefile.am
+++ b/scripts/gdb/Makefile.am
@@ -2,6 +2,8 @@
 ## $Id$
 ##
 
+include $(top_srcdir)/common/common.am
+
 MKSPEC = $(SHELL) ./mkspec
 
 SUBPACKAGES = header.add
diff --git a/scripts/rtems/Makefile.am b/scripts/rtems/Makefile.am
index adca9d2e7f..39856c4f5d 100644
--- a/scripts/rtems/Makefile.am
+++ b/scripts/rtems/Makefile.am
@@ -2,6 +2,7 @@
 ## $Id$
 ##
 
+include $(top_srcdir)/common/common.am
 
 MKBSPSPEC = $(SHELL) $(top_builddir)/mkbspspec
 
diff --git a/scripts/rtemsdoc/Makefile.am b/scripts/rtemsdoc/Makefile.am
index fd205e54e4..c294037973 100644
--- a/scripts/rtemsdoc/Makefile.am
+++ b/scripts/rtemsdoc/Makefile.am
@@ -2,6 +2,8 @@
 ## $Id$
 ##
 
+include ${top_srcdir}/common/common.am
+
 CLEANFILES =
 
 MKSPEC = $(SHELL) ./mkspec