Backup.

6 files changed, 50 insertions, 50 deletions

diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am
index 0d58ff4e66..797d1c124f 100644
--- a/contrib/crossrpms/cygwin/Makefile.am
+++ b/contrib/crossrpms/cygwin/Makefile.am
@@ -16,16 +16,16 @@ LIBS_SUBPACKAGES += target-libs.add
 
 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
 	cat $(LIBS_SUBPACKAGES) | sed \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]CYGWIN_VERS[@]/$(CYGWIN_VERS)/g" \
+	  -e "s/[@]CYGWIN_RPMREL[@]/$(CYGWIN_RPMREL)/g" \
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
 	                      
 @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]CYGWIN_VERS[@]/$(CYGWIN_VERS)/g" \
-	  -e "s/[@]CYGWIN_RPMREL[@]/$(CYGWIN_RPMREL)/g" \
 	  $(srcdir)/$(TARGET)-libs.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
 noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
@@ -48,7 +48,8 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
+	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
@@ -56,9 +57,8 @@ CLEANFILES += $(TARGET)-binutils.spec.in
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
 	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
@@ -83,7 +83,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	cat $(GCC_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
+	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -96,9 +97,8 @@ CLEANFILES += $(TARGET)-gcc.spec.in
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
 	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-gcc.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am
index 7445b0aa28..3feef1d083 100644
--- a/contrib/crossrpms/freebsd5.2/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/Makefile.am
@@ -16,16 +16,16 @@ LIBS_SUBPACKAGES += target-libs.add
 
 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
 	cat $(LIBS_SUBPACKAGES) | sed \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
+	  -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
 	                      
 @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
-	  -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \
 	  $(srcdir)/$(TARGET)-libs.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
 noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
@@ -48,7 +48,8 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
+	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
@@ -56,9 +57,8 @@ CLEANFILES += $(TARGET)-binutils.spec.in
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
 	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
@@ -83,7 +83,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	cat $(GCC_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
+	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -97,9 +98,8 @@ CLEANFILES += $(TARGET)-gcc.spec.in
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
 	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-gcc.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
diff --git a/contrib/crossrpms/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am
index bfc1cf0fe5..7166ae8ef9 100644
--- a/contrib/crossrpms/freebsd6.0/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/Makefile.am
@@ -16,15 +16,15 @@ LIBS_SUBPACKAGES += target-libs.add
 
 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
 	cat $(LIBS_SUBPACKAGES) | sed \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
+	  -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
 	                      
 @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
 	sed \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
-	  -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \
 	  $(srcdir)/$(TARGET)-libs.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
 noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
@@ -47,7 +47,8 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
+	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
@@ -55,9 +56,8 @@ CLEANFILES += $(TARGET)-binutils.spec.in
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
 	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
@@ -82,7 +82,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	cat $(GCC_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
+	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -96,9 +97,8 @@ CLEANFILES += $(TARGET)-gcc.spec.in
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
 	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-gcc.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am
index ec6389e62c..5a9f7c6cac 100644
--- a/contrib/crossrpms/mingw32/Makefile.am
+++ b/contrib/crossrpms/mingw32/Makefile.am
@@ -16,16 +16,16 @@ LIBS_SUBPACKAGES += target-libs.add
 
 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
 	cat $(LIBS_SUBPACKAGES) | sed \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]MINGW32_VERS[@]/$(MINGW32_VERS)/g" \
+	  -e "s/[@]MINGW32_RPMREL[@]/$(MINGW32_RPMREL)/g" \
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
 	                      
 @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]MINGW32_VERS[@]/$(MINGW32_VERS)/g" \
-	  -e "s/[@]MINGW32_RPMREL[@]/$(MINGW32_RPMREL)/g" \
 	  $(srcdir)/$(TARGET)-libs.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
 noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
@@ -41,16 +41,16 @@ W32API_SUBPACKAGES += target-w32api.add
 
 $(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES) Makefile.am
 	cat $(W32API_SUBPACKAGES) | sed \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]W32API_VERS[@]/$(W32API_VERS)/g" \
+	  -e "s/[@]W32API_RPMREL[@]/$(W32API_RPMREL)/g" \
 	> $(TARGET)-w32api.spec.in
 CLEANFILES += $(TARGET)-w32api.spec.in
 	                      
 @rpmprefix@$(TARGET)-w32api.spec: $(TARGET)-w32api.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]W32API_VERS[@]/$(W32API_VERS)/g" \
-	  -e "s/[@]W32API_RPMREL[@]/$(W32API_RPMREL)/g" \
 	  $(srcdir)/$(TARGET)-w32api.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-w32api.spec
 noinst_DATA += @rpmprefix@$(TARGET)-w32api.spec
@@ -73,7 +73,8 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
+	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
@@ -81,9 +82,8 @@ CLEANFILES += $(TARGET)-binutils.spec.in
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
 	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
@@ -108,7 +108,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	cat $(GCC_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
+	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "/[@]rpmprefix[@][@]tool_target[@]-libc/d" \
 	  -e "s,^%define[ ]*_cxx[ 	]*1,%define _cxx		0," \
@@ -122,9 +123,8 @@ CLEANFILES += $(TARGET)-gcc.spec.in
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
 	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-gcc.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
diff --git a/contrib/crossrpms/rtems/Makefile.am b/contrib/crossrpms/rtems/Makefile.am
index a241f7ca4e..13663e0a2a 100644
--- a/contrib/crossrpms/rtems/Makefile.am
+++ b/contrib/crossrpms/rtems/Makefile.am
@@ -22,7 +22,6 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
@@ -30,6 +29,7 @@ CLEANFILES += $(TARGET)-binutils.spec.in
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -60,7 +60,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	cat $(GCC_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
 	  -e "s/-n @rpmprefix@@tool_target@-gcc//" \
@@ -73,6 +72,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am
index c7e5b6b69b..e7c2b5935f 100644
--- a/contrib/crossrpms/solaris2.7/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/Makefile.am
@@ -16,16 +16,16 @@ LIBS_SUBPACKAGES += target-libs.add
 
 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
 	cat $(LIBS_SUBPACKAGES) | sed \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]SOLARIS_VERS[@]/$(SOLARIS_VERS)/g" \
+	  -e "s/[@]SOLARIS_RPMREL[@]/$(SOLARIS_RPMREL)/g" \
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
 	                      
 @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]SOLARIS_VERS[@]/$(SOLARIS_VERS)/g" \
-	  -e "s/[@]SOLARIS_RPMREL[@]/$(SOLARIS_RPMREL)/g" \
 	  $(srcdir)/$(TARGET)-libs.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
 noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
@@ -48,7 +48,8 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
+	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
@@ -56,9 +57,8 @@ CLEANFILES += $(TARGET)-binutils.spec.in
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
-	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
 	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-binutils.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
@@ -83,7 +83,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	cat $(GCC_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,[@]_prefix[@],$(prefix),g" \
+	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
+	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -97,9 +98,8 @@ CLEANFILES += $(TARGET)-gcc.spec.in
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	sed \
 	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
+	  -e "s,[@]_prefix[@],$(prefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
-	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
 	  -e "/[@]PATCH/d" \
 	  $(srcdir)/$(TARGET)-gcc.spec.in > $@
 CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec