Added sh-rtemself and m68k-rtemself.

10 files changed, 176 insertions, 143 deletions

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index c65721ac3c..6467e1affb 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -85,8 +85,6 @@ EXTRA_DIST =  $(noinst_DATA) $(noinst_SCRIPTS)
 CONFIGURE_DEPENDENCIES = setup.cache
 
 DISTCLEANFILES = setup.cache
-
-CLEANFILES = buildall
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =  buildall mkbinutilspec mkgccnewlibspec mkgdbspec \
@@ -313,7 +311,6 @@ installdirs-am:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am
index b586eccebc..83556b88b5 100644
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -7,42 +7,50 @@ MKBINUTILSSPEC = $(SHELL) $(top_builddir)/mkbinutilspec
 MKBINUTILSSPEC_DEPS = \
 $(top_builddir)/mkbinutilspec binutils.spec.in $(top_builddir)/setup.cache
 
+hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
+
 i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
 
-sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
-
-powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
-
-sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
+i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
 
 m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
 
+m68k-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself
+
 mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
 	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
 
-i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
+powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
 
-hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
+sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
+
+sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself
+
+sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
 TEMPLATES = \
 binutils.spec.in
 
 RPM_SPECS_DATA = \
+hppa1.1-rtems-$(BINUTILSVERS).spec \
 i386-rtems-$(BINUTILSVERS).spec \
-sh-rtems-$(BINUTILSVERS).spec \
-powerpc-rtems-$(BINUTILSVERS).spec \
-sparc-rtems-$(BINUTILSVERS).spec \
+i960-rtems-$(BINUTILSVERS).spec \
 m68k-rtems-$(BINUTILSVERS).spec \
+m68k-rtemself-$(BINUTILSVERS).spec \
 mips64orion-rtems-$(BINUTILSVERS).spec \
-i960-rtems-$(BINUTILSVERS).spec \
-hppa1.1-rtems-$(BINUTILSVERS).spec
+powerpc-rtems-$(BINUTILSVERS).spec \
+sh-rtems-$(BINUTILSVERS).spec \
+sh-rtemself-$(BINUTILSVERS).spec \
+sparc-rtems-$(BINUTILSVERS).spec
 
 noinst_DATA = \
 $(TEMPLATES)
diff --git a/scripts/binutils/Makefile.in b/scripts/binutils/Makefile.in
index fc6640b762..f7c6c4d3ca 100644
--- a/scripts/binutils/Makefile.in
+++ b/scripts/binutils/Makefile.in
@@ -69,14 +69,15 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
 
-MKBINUTILSSPEC = $(SHELL) $(top_srcdir)/mkbinutilspec
+MKBINUTILSSPEC = $(SHELL) $(top_builddir)/mkbinutilspec
+
+MKBINUTILSSPEC_DEPS =  $(top_builddir)/mkbinutilspec binutils.spec.in $(top_builddir)/setup.cache
 
-MKBINUTILSSPEC_DEPS = ../mkbinutilspec binutils.spec.in ../setup.cache
 
 TEMPLATES =  binutils.spec.in
 
 
-RPM_SPECS_DATA =  i386-rtems-$(BINUTILSVERS).spec sh-rtems-$(BINUTILSVERS).spec sh-rtemself-$(BINUTILSVERS).spec powerpc-rtems-$(BINUTILSVERS).spec sparc-rtems-$(BINUTILSVERS).spec m68k-rtems-$(BINUTILSVERS).spec m68k-rtemself-$(BINUTILSVERS).spec mips64orion-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec hppa1.1-rtems-$(BINUTILSVERS).spec
+RPM_SPECS_DATA =  hppa1.1-rtems-$(BINUTILSVERS).spec i386-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec m68k-rtems-$(BINUTILSVERS).spec m68k-rtemself-$(BINUTILSVERS).spec mips64orion-rtems-$(BINUTILSVERS).spec powerpc-rtems-$(BINUTILSVERS).spec sh-rtems-$(BINUTILSVERS).spec sh-rtemself-$(BINUTILSVERS).spec sparc-rtems-$(BINUTILSVERS).spec
 
 
 noinst_DATA =  $(TEMPLATES)
@@ -212,35 +213,35 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . i386-rtems
-
-sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sh-rtems
-
-sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sh-rtemself
+hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
 
-powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . powerpc-rtems
+i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
 
-sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sparc-rtems
+i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
 
 m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . m68k-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
 
 m68k-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . m68k-rtemself
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself
 
 mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . mips64orion-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
 
-i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . i960-rtems
+powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
 
-hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
+sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
+
+sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself
+
+sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/scripts/configure b/scripts/configure
index da668e4913..b869a30646 100644
--- a/scripts/configure
+++ b/scripts/configure
@@ -692,7 +692,7 @@ fi
 
 PACKAGE=scripts
 
-VERSION=19991020-1
+VERSION=19991021-0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -768,14 +768,16 @@ fi
 
 
 
-test -f ./setup.cache || cp ./setup.def ./setup.cache
+# RTEMS_CHECK_VERSION(..)
+
+test -f ./setup.cache || cp ${srcdir}/setup.def ./setup.cache
 . ./setup.cache
 
 # Some linux distributions use /usr/src/packages
 # redhat uses /usr/src/redhat
 # others might use /usr/src
 echo $ac_n "checking for rpm SPECS directory""... $ac_c" 1>&6
-echo "configure:779: checking for rpm SPECS directory" >&5
+echo "configure:781: checking for rpm SPECS directory" >&5
 if test -d /usr/src/packages/SPECS;
 then
   RPM_SPECSdir=/usr/src/packages/SPECS;
@@ -786,7 +788,7 @@ elif test -d /usr/src/SPECS/;
 then
   RPM_SPECSdir=/usr/src/SPECS;
 fi
-if test x"$RPM_SPECSdir" = x; then
+if test x"$RPM_SPECSdir" = x"" ; then
 { echo "configure: error: not found" 1>&2; exit 1; }
 fi
 echo "$ac_t""$RPM_SPECSdir" 1>&6
@@ -798,7 +800,7 @@ BINUTILSVERS="binutils-${binutils_version}"
 
 GDBVERS="gdb-${gdb_version}"
 
-BSPVERS="RTEMS-no_version_yet"
+BSPVERS="${RTEMS_VERSION}"
 
 
 trap '' 1 2 15
diff --git a/scripts/configure.in b/scripts/configure.in
index be20f53271..bf31304680 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -3,7 +3,7 @@
 AC_INIT(binutils)
 AM_INIT_AUTOMAKE(scripts,19991021-0,no)
 
-RTEMS_CHECK_VERSION(..)
+# RTEMS_CHECK_VERSION(..)
 
 test -f ./setup.cache || cp ${srcdir}/setup.def ./setup.cache
 . ./setup.cache
diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am
index c3f6f467d7..099ee80b17 100644
--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -7,42 +7,50 @@ MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec
 MKGCCNEWLIBSPEC_DEPS = \
   $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in $(top_builddir)/setup.cache
 
+hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
+
 i386-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
 
-sh-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
-
-powerpc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
-
-sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
+i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
 
 m68k-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
 
+m68k-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself
+
 mips64orion-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
 
-i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
+powerpc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
 
-hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
+sh-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
+
+sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself
+
+sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
 TEMPLATES = \
 gccnewlib.spec.in
 
 RPM_SPECS_DATA = \
+hppa1.1-rtems-$(GCCNEWLIBVERS).spec \
 i386-rtems-$(GCCNEWLIBVERS).spec \
-sh-rtems-$(GCCNEWLIBVERS).spec \
-powerpc-rtems-$(GCCNEWLIBVERS).spec \
-sparc-rtems-$(GCCNEWLIBVERS).spec \
+i960-rtems-$(GCCNEWLIBVERS).spec \
 m68k-rtems-$(GCCNEWLIBVERS).spec \
+m68k-rtemself-$(GCCNEWLIBVERS).spec \
 mips64orion-rtems-$(GCCNEWLIBVERS).spec \
-i960-rtems-$(GCCNEWLIBVERS).spec \
-hppa1.1-rtems-$(GCCNEWLIBVERS).spec
+powerpc-rtems-$(GCCNEWLIBVERS).spec \
+sh-rtems-$(GCCNEWLIBVERS).spec \
+sh-rtemself-$(GCCNEWLIBVERS).spec \
+sparc-rtems-$(GCCNEWLIBVERS).spec 
 
 noinst_DATA = \
 $(TEMPLATES)
diff --git a/scripts/gccnewlib/Makefile.in b/scripts/gccnewlib/Makefile.in
index 3491b8bb2b..ca78c7a434 100644
--- a/scripts/gccnewlib/Makefile.in
+++ b/scripts/gccnewlib/Makefile.in
@@ -69,15 +69,15 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
 
-MKGCCNEWLIBSPEC = $(SHELL) ../mkgccnewlibspec
+MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec
 
-MKGCCNEWLIBSPEC_DEPS =    ../mkgccnewlibspec gccnewlib.spec.in ../setup.cache
+MKGCCNEWLIBSPEC_DEPS =    $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in $(top_builddir)/setup.cache
 
 
 TEMPLATES =  gccnewlib.spec.in
 
 
-RPM_SPECS_DATA =  i386-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec sh-rtemself-$(GCCNEWLIBVERS).spec powerpc-rtems-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec m68k-rtems-$(GCCNEWLIBVERS).spec m68k-rtemself-$(GCCNEWLIBVERS).spec mips64orion-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec hppa1.1-rtems-$(GCCNEWLIBVERS).spec
+RPM_SPECS_DATA =  hppa1.1-rtems-$(GCCNEWLIBVERS).spec i386-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec m68k-rtems-$(GCCNEWLIBVERS).spec m68k-rtemself-$(GCCNEWLIBVERS).spec mips64orion-rtems-$(GCCNEWLIBVERS).spec powerpc-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec sh-rtemself-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec 
 
 
 noinst_DATA =  $(TEMPLATES)
@@ -213,35 +213,35 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-i386-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . i386-rtems
-
-sh-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sh-rtems
-
-sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sh-rtemself
+hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
 
-powerpc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . powerpc-rtems
+i386-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
 
-sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sparc-rtems
+i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
 
 m68k-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . m68k-rtems
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
 
 m68k-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . m68k-rtemself
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself
 
 mips64orion-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . mips64orion-rtems
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
 
-i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . i960-rtems
+powerpc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
 
-hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
+sh-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
+
+sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself
+
+sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am
index ed3f51d7a9..74782485cb 100644
--- a/scripts/gdb/Makefile.am
+++ b/scripts/gdb/Makefile.am
@@ -5,42 +5,50 @@ MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec
 MKGDBSPEC_DEPS = \
 $(top_builddir)/mkgdbspec gdb.spec.in $(top_builddir)/setup.cache
 
+hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
+
 i386-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
 
-sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
-
-powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
-
-sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
+i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
 
 m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
 
+m68k-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself
+
 mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
 
-i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
+powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
 
-hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
+sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
+
+sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself
+
+sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
 TEMPLATES = \
 gdb.spec.in
 
 RPM_SPECS_DATA = \
+hppa1.1-rtems-$(GDBVERS).spec \
 i386-rtems-$(GDBVERS).spec \
-sh-rtems-$(GDBVERS).spec \
-powerpc-rtems-$(GDBVERS).spec \
-sparc-rtems-$(GDBVERS).spec \
+i960-rtems-$(GDBVERS).spec \
 m68k-rtems-$(GDBVERS).spec \
+m68k-rtemself-$(GDBVERS).spec \
 mips64orion-rtems-$(GDBVERS).spec \
-i960-rtems-$(GDBVERS).spec \
-hppa1.1-rtems-$(GDBVERS).spec
+powerpc-rtems-$(GDBVERS).spec \
+sh-rtems-$(GDBVERS).spec \
+sh-rtemself-$(GDBVERS).spec \
+sparc-rtems-$(GDBVERS).spec
 
 noinst_DATA = \
 $(TEMPLATES)
diff --git a/scripts/gdb/Makefile.in b/scripts/gdb/Makefile.in
index 07c4e73b64..0973fb87d1 100644
--- a/scripts/gdb/Makefile.in
+++ b/scripts/gdb/Makefile.in
@@ -69,14 +69,15 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
 
-MKGDBSPEC = $(SHELL) $(top_srcdir)/mkgdbspec
+MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec
+
+MKGDBSPEC_DEPS =  $(top_builddir)/mkgdbspec gdb.spec.in $(top_builddir)/setup.cache
 
-MKGDBSPEC_DEPS = ../mkgdbspec gdb.spec.in ../setup.cache
 
 TEMPLATES =  gdb.spec.in
 
 
-RPM_SPECS_DATA =  i386-rtems-$(GDBVERS).spec sh-rtems-$(GDBVERS).spec sh-rtemself-$(GDBVERS).spec powerpc-rtems-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec m68k-rtems-$(GDBVERS).spec m68k-rtemself-$(GDBVERS).spec mips64orion-rtems-$(GDBVERS).spec i960-rtems-$(GDBVERS).spec hppa1.1-rtems-$(GDBVERS).spec
+RPM_SPECS_DATA =  hppa1.1-rtems-$(GDBVERS).spec i386-rtems-$(GDBVERS).spec i960-rtems-$(GDBVERS).spec m68k-rtems-$(GDBVERS).spec m68k-rtemself-$(GDBVERS).spec mips64orion-rtems-$(GDBVERS).spec powerpc-rtems-$(GDBVERS).spec sh-rtems-$(GDBVERS).spec sh-rtemself-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec
 
 
 noinst_DATA =  $(TEMPLATES)
@@ -212,35 +213,35 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-i386-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . i386-rtems
-
-sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . sh-rtems
-
-sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . sh-rtemself
+hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
 
-powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . powerpc-rtems
+i386-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
 
-sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . sparc-rtems
+i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
 
 m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . m68k-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
 
 m68k-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . m68k-rtemself
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself
 
 mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . mips64orion-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
 
-i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . i960-rtems
+powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
 
-hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
+sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
+
+sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself
+
+sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/scripts/rtems/Makefile.am b/scripts/rtems/Makefile.am
index 94ff330145..f7158237ef 100644
--- a/scripts/rtems/Makefile.am
+++ b/scripts/rtems/Makefile.am
@@ -4,42 +4,50 @@ MKBSPSPEC = $(SHELL) $(top_builddir)/mkbspspec
 
 MKBSPSPEC_DEPS = $(top_builddir)/mkbspspec rtems.spec.in $(top_builddir)/setup.cache
 
+hppa1.1-rtems-simhppa-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
+	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems simhppa
+
 i386-rtems-pc386-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
 	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems pc386
 
-sh-rtems-gensh1-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
-	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems gensh1
-
-powerpc-rtems-mcp750-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
-	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems mcp750
-
-sparc-rtems-erc32-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
-	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems erc32
+i960-rtems-cvme961-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
+	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems cvme961
 
 m68k-rtems-gen68360-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
 	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems gen68360
 
+m68k-rtemself-gen68360-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
+	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself gen68360
+
 mips64orion-rtems-p4600-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
 	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems p4600
 
-i960-rtems-cvme961-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
-	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems cvme961
+powerpc-rtems-mcp750-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
+	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems mcp750
 
-hppa1.1-rtems-simhppa-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
-	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems simhppa
+sh-rtems-gensh1-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
+	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems gensh1
+
+sh-rtemself-gensh1-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
+	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself gensh1
+
+sparc-rtems-erc32-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
+	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems erc32
 
 TEMPLATES = \
 rtems.spec.in
 
 RPM_SPECS_DATA = \
+hppa1.1-rtems-simhppa-$(BSPVERS).spec \
 i386-rtems-pc386-$(BSPVERS).spec \
-sh-rtems-gensh1-$(BSPVERS).spec \
-powerpc-rtems-mcp750-$(BSPVERS).spec \
-sparc-rtems-erc32-$(BSPVERS).spec \
+i960-rtems-cvme961-$(BSPVERS).spec \
 m68k-rtems-gen68360-$(BSPVERS).spec \
+m68k-rtemself-gen68360-$(BSPVERS).spec \
 mips64orion-rtems-p4600-$(BSPVERS).spec \
-i960-rtems-cvme961-$(BSPVERS).spec \
-hppa1.1-rtems-simhppa-$(BSPVERS).spec
+powerpc-rtems-mcp750-$(BSPVERS).spec \
+sh-rtems-gensh1-$(BSPVERS).spec \
+sh-rtemself-gensh1-$(BSPVERS).spec \
+sparc-rtems-erc32-$(BSPVERS).spec
 
 noinst_DATA = \
 $(TEMPLATES)