Index: scripts/Makefile.in
===================================================================
--- scripts/Makefile.in	(revision 43e7d103a0aa620f5f75c4ccac2f5b6c3d3f9433)
+++ scripts/Makefile.in	(revision 395376571816810d89492fa1452958840efa8c07)
@@ -86,6 +86,4 @@
 
 DISTCLEANFILES = setup.cache
-
-CLEANFILES = buildall
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -314,5 +312,4 @@
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
Index: scripts/binutils/Makefile.am
===================================================================
--- scripts/binutils/Makefile.am	(revision 43e7d103a0aa620f5f75c4ccac2f5b6c3d3f9433)
+++ scripts/binutils/Makefile.am	(revision 395376571816810d89492fa1452958840efa8c07)
@@ -8,27 +8,33 @@
 $(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
+
+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
+
+powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-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
+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
-
-m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
-
-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
-
-hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
 
 TEMPLATES = \
@@ -36,12 +42,14 @@
 
 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 \
-powerpc-rtems-$(BINUTILSVERS).spec \
-sparc-rtems-$(BINUTILSVERS).spec \
-m68k-rtems-$(BINUTILSVERS).spec \
-mips64orion-rtems-$(BINUTILSVERS).spec \
-i960-rtems-$(BINUTILSVERS).spec \
-hppa1.1-rtems-$(BINUTILSVERS).spec
+sh-rtemself-$(BINUTILSVERS).spec \
+sparc-rtems-$(BINUTILSVERS).spec
 
 noinst_DATA = \
Index: scripts/binutils/Makefile.in
===================================================================
--- scripts/binutils/Makefile.in	(revision 43e7d103a0aa620f5f75c4ccac2f5b6c3d3f9433)
+++ scripts/binutils/Makefile.in	(revision 395376571816810d89492fa1452958840efa8c07)
@@ -70,12 +70,13 @@
 AUTOMAKE_OPTIONS = foreign
 
-MKBINUTILSSPEC = $(SHELL) $(top_srcdir)/mkbinutilspec
-
-MKBINUTILSSPEC_DEPS = ../mkbinutilspec binutils.spec.in ../setup.cache
+MKBINUTILSSPEC = $(SHELL) $(top_builddir)/mkbinutilspec
+
+MKBINUTILSSPEC_DEPS =  $(top_builddir)/mkbinutilspec binutils.spec.in $(top_builddir)/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
 
 
@@ -213,33 +214,33 @@
 
 
+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 ../setup.cache -o . i386-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i386-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
+
+powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
 
 sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sh-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
 
 sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sh-rtemself
-
-powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . powerpc-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself
 
 sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sparc-rtems
-
-m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . m68k-rtems
-
-m68k-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . m68k-rtemself
-
-mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . mips64orion-rtems
-
-i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . i960-rtems
-
-hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
+	$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: scripts/configure
===================================================================
--- scripts/configure	(revision 43e7d103a0aa620f5f75c4ccac2f5b6c3d3f9433)
+++ scripts/configure	(revision 395376571816810d89492fa1452958840efa8c07)
@@ -693,5 +693,5 @@
 PACKAGE=scripts
 
-VERSION=19991020-1
+VERSION=19991021-0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
@@ -769,5 +769,7 @@
 
 
-test -f ./setup.cache || cp ./setup.def ./setup.cache
+# RTEMS_CHECK_VERSION(..)
+
+test -f ./setup.cache || cp ${srcdir}/setup.def ./setup.cache
 . ./setup.cache
 
@@ -776,5 +778,5 @@
 # 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
@@ -787,5 +789,5 @@
   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
@@ -799,5 +801,5 @@
 GDBVERS="gdb-${gdb_version}"
 
-BSPVERS="RTEMS-no_version_yet"
+BSPVERS="${RTEMS_VERSION}"
 
 
Index: scripts/configure.in
===================================================================
--- scripts/configure.in	(revision 43e7d103a0aa620f5f75c4ccac2f5b6c3d3f9433)
+++ scripts/configure.in	(revision 395376571816810d89492fa1452958840efa8c07)
@@ -4,5 +4,5 @@
 AM_INIT_AUTOMAKE(scripts,19991021-0,no)
 
-RTEMS_CHECK_VERSION(..)
+# RTEMS_CHECK_VERSION(..)
 
 test -f ./setup.cache || cp ${srcdir}/setup.def ./setup.cache
Index: scripts/gccnewlib/Makefile.am
===================================================================
--- scripts/gccnewlib/Makefile.am	(revision 43e7d103a0aa620f5f75c4ccac2f5b6c3d3f9433)
+++ scripts/gccnewlib/Makefile.am	(revision 395376571816810d89492fa1452958840efa8c07)
@@ -8,27 +8,33 @@
   $(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
+
+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
+
+powerpc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-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
+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
-
-m68k-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
-
-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
-
-hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
 
 TEMPLATES = \
@@ -36,12 +42,14 @@
 
 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 \
-powerpc-rtems-$(GCCNEWLIBVERS).spec \
-sparc-rtems-$(GCCNEWLIBVERS).spec \
-m68k-rtems-$(GCCNEWLIBVERS).spec \
-mips64orion-rtems-$(GCCNEWLIBVERS).spec \
-i960-rtems-$(GCCNEWLIBVERS).spec \
-hppa1.1-rtems-$(GCCNEWLIBVERS).spec
+sh-rtemself-$(GCCNEWLIBVERS).spec \
+sparc-rtems-$(GCCNEWLIBVERS).spec 
 
 noinst_DATA = \
Index: scripts/gccnewlib/Makefile.in
===================================================================
--- scripts/gccnewlib/Makefile.in	(revision 43e7d103a0aa620f5f75c4ccac2f5b6c3d3f9433)
+++ scripts/gccnewlib/Makefile.in	(revision 395376571816810d89492fa1452958840efa8c07)
@@ -70,7 +70,7 @@
 AUTOMAKE_OPTIONS = foreign
 
-MKGCCNEWLIBSPEC = $(SHELL) ../mkgccnewlibspec
-
-MKGCCNEWLIBSPEC_DEPS =    ../mkgccnewlibspec gccnewlib.spec.in ../setup.cache
+MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec
+
+MKGCCNEWLIBSPEC_DEPS =    $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in $(top_builddir)/setup.cache
 
 
@@ -78,5 +78,5 @@
 
 
-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 
 
 
@@ -214,33 +214,33 @@
 
 
+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 ../setup.cache -o . i386-rtems
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-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
+
+powerpc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
 
 sh-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sh-rtems
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
 
 sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sh-rtemself
-
-powerpc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . powerpc-rtems
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself
 
 sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . sparc-rtems
-
-m68k-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . m68k-rtems
-
-m68k-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . m68k-rtemself
-
-mips64orion-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . mips64orion-rtems
-
-i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . i960-rtems
-
-hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
-	$(MKGCCNEWLIBSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
+	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: scripts/gdb/Makefile.am
===================================================================
--- scripts/gdb/Makefile.am	(revision 43e7d103a0aa620f5f75c4ccac2f5b6c3d3f9433)
+++ scripts/gdb/Makefile.am	(revision 395376571816810d89492fa1452958840efa8c07)
@@ -6,27 +6,33 @@
 $(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
+
+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
+
+powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-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
+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
-
-m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
-
-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
-
-hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
 
 TEMPLATES = \
@@ -34,12 +40,14 @@
 
 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 \
-powerpc-rtems-$(GDBVERS).spec \
-sparc-rtems-$(GDBVERS).spec \
-m68k-rtems-$(GDBVERS).spec \
-mips64orion-rtems-$(GDBVERS).spec \
-i960-rtems-$(GDBVERS).spec \
-hppa1.1-rtems-$(GDBVERS).spec
+sh-rtemself-$(GDBVERS).spec \
+sparc-rtems-$(GDBVERS).spec
 
 noinst_DATA = \
Index: scripts/gdb/Makefile.in
===================================================================
--- scripts/gdb/Makefile.in	(revision 43e7d103a0aa620f5f75c4ccac2f5b6c3d3f9433)
+++ scripts/gdb/Makefile.in	(revision 395376571816810d89492fa1452958840efa8c07)
@@ -70,12 +70,13 @@
 AUTOMAKE_OPTIONS = foreign
 
-MKGDBSPEC = $(SHELL) $(top_srcdir)/mkgdbspec
-
-MKGDBSPEC_DEPS = ../mkgdbspec gdb.spec.in ../setup.cache
+MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec
+
+MKGDBSPEC_DEPS =  $(top_builddir)/mkgdbspec gdb.spec.in $(top_builddir)/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
 
 
@@ -213,33 +214,33 @@
 
 
+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 ../setup.cache -o . i386-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-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
+
+powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
 
 sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . sh-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
 
 sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . sh-rtemself
-
-powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . powerpc-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself
 
 sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . sparc-rtems
-
-m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . m68k-rtems
-
-m68k-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . m68k-rtemself
-
-mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . mips64orion-rtems
-
-i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . i960-rtems
-
-hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: scripts/rtems/Makefile.am
===================================================================
--- scripts/rtems/Makefile.am	(revision 43e7d103a0aa620f5f75c4ccac2f5b6c3d3f9433)
+++ scripts/rtems/Makefile.am	(revision 395376571816810d89492fa1452958840efa8c07)
@@ -5,27 +5,33 @@
 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
+
+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
+
+powerpc-rtems-mcp750-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
+	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems mcp750
 
 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
+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
-
-m68k-rtems-gen68360-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
-	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems 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
-
-hppa1.1-rtems-simhppa-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
-	$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems simhppa
 
 TEMPLATES = \
@@ -33,12 +39,14 @@
 
 RPM_SPECS_DATA = \
+hppa1.1-rtems-simhppa-$(BSPVERS).spec \
 i386-rtems-pc386-$(BSPVERS).spec \
+i960-rtems-cvme961-$(BSPVERS).spec \
+m68k-rtems-gen68360-$(BSPVERS).spec \
+m68k-rtemself-gen68360-$(BSPVERS).spec \
+mips64orion-rtems-p4600-$(BSPVERS).spec \
+powerpc-rtems-mcp750-$(BSPVERS).spec \
 sh-rtems-gensh1-$(BSPVERS).spec \
-powerpc-rtems-mcp750-$(BSPVERS).spec \
-sparc-rtems-erc32-$(BSPVERS).spec \
-m68k-rtems-gen68360-$(BSPVERS).spec \
-mips64orion-rtems-p4600-$(BSPVERS).spec \
-i960-rtems-cvme961-$(BSPVERS).spec \
-hppa1.1-rtems-simhppa-$(BSPVERS).spec
+sh-rtemself-gensh1-$(BSPVERS).spec \
+sparc-rtems-erc32-$(BSPVERS).spec
 
 noinst_DATA = \
