Backup.

6 files changed, 24 insertions, 25 deletions

diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am
index 40cb60138a..0d58ff4e66 100644
--- a/contrib/crossrpms/cygwin/Makefile.am
+++ b/contrib/crossrpms/cygwin/Makefile.am
@@ -17,13 +17,13 @@ LIBS_SUBPACKAGES += target-libs.add
 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
 	cat $(LIBS_SUBPACKAGES) | sed \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
 	                      
 @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
 	sed \
-	  -e "s/@tool_target@/$(TARGET)/g" \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),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 > $@
@@ -49,13 +49,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -84,7 +84,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -96,6 +95,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	sed \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),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/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am
index 91bf533440..7445b0aa28 100644
--- a/contrib/crossrpms/freebsd5.2/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/Makefile.am
@@ -17,13 +17,13 @@ LIBS_SUBPACKAGES += target-libs.add
 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
 	cat $(LIBS_SUBPACKAGES) | sed \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
 	                      
 @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
 	sed \
-	  -e "s/@tool_target@/$(TARGET)/g" \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),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 > $@
@@ -49,13 +49,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -84,7 +84,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -97,6 +96,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	sed \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),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/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am
index 62aabcaed8..bfc1cf0fe5 100644
--- a/contrib/crossrpms/freebsd6.0/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/Makefile.am
@@ -17,13 +17,12 @@ LIBS_SUBPACKAGES += target-libs.add
 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
 	cat $(LIBS_SUBPACKAGES) | sed \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
 	                      
 @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
 	sed \
-	  -e "s/@tool_target@/$(TARGET)/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 > $@
@@ -49,13 +48,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -84,7 +83,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -97,6 +95,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	sed \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),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/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am
index 9eda82b26d..ec6389e62c 100644
--- a/contrib/crossrpms/mingw32/Makefile.am
+++ b/contrib/crossrpms/mingw32/Makefile.am
@@ -17,13 +17,13 @@ LIBS_SUBPACKAGES += target-libs.add
 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
 	cat $(LIBS_SUBPACKAGES) | sed \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
 	                      
 @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
 	sed \
-	  -e "s/@tool_target@/$(TARGET)/g" \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),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 > $@
@@ -42,13 +42,13 @@ W32API_SUBPACKAGES += target-w32api.add
 $(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES) Makefile.am
 	cat $(W32API_SUBPACKAGES) | sed \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	> $(TARGET)-w32api.spec.in
 CLEANFILES += $(TARGET)-w32api.spec.in
 	                      
 @rpmprefix@$(TARGET)-w32api.spec: $(TARGET)-w32api.spec.in
 	sed \
-	  -e "s/@tool_target@/$(TARGET)/g" \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),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 > $@
@@ -74,13 +74,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -109,9 +109,8 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
+	  -e "/[@]rpmprefix[@][@]tool_target[@]-libc/d" \
 	  -e "s,^%define[ ]*_cxx[ 	]*1,%define _cxx		0," \
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
@@ -122,6 +121,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	sed \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),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/rtems/Makefile.am b/contrib/crossrpms/rtems/Makefile.am
index 79d5b0c050..a241f7ca4e 100644
--- a/contrib/crossrpms/rtems/Makefile.am
+++ b/contrib/crossrpms/rtems/Makefile.am
@@ -23,13 +23,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -61,7 +61,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),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/[@]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 70a790ec65..c7e5b6b69b 100644
--- a/contrib/crossrpms/solaris2.7/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/Makefile.am
@@ -17,13 +17,13 @@ LIBS_SUBPACKAGES += target-libs.add
 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
 	cat $(LIBS_SUBPACKAGES) | sed \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
 	                      
 @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
 	sed \
-	  -e "s/@tool_target@/$(TARGET)/g" \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),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 > $@
@@ -49,13 +49,13 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
 @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	sed \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
@@ -84,7 +84,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s,[@]_prefix[@],$(prefix),g" \
-	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,[=<][ ]*%{newlib_version}-%{release},," \
@@ -97,6 +96,7 @@ CLEANFILES += $(TARGET)-gcc.spec.in
 
 @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	sed \
+	  -e "s,[@]rpmprefix[@],$(rpmprefix),g" \
 	  -e "s/[@]tool_target[@]/$(TARGET)/g" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \