diff options
| -rw-r--r-- | contrib/crossrpms/common/common.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/cygwin/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/freebsd5.2/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/freebsd6.0/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/mingw32/Makefile.am | 10 | ||||
| -rw-r--r-- | contrib/crossrpms/rtems/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/solaris2.7/Makefile.am | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/contrib/crossrpms/common/common.add b/contrib/crossrpms/common/common.add index 83f9873ca7..5dbe53fcdc 100644 --- a/contrib/crossrpms/common/common.add +++ b/contrib/crossrpms/common/common.add @@ -4,7 +4,7 @@ # or mailto:rtems-bugs@rtems.com # -%define _prefix /usr +%define _prefix @_prefix@ %if "%{_prefix}" != "/usr" %define _infodir %{_prefix}/info %define _mandir %{_prefix}/man diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am index f57e298d17..bc72f607b1 100644 --- a/contrib/crossrpms/cygwin/Makefile.am +++ b/contrib/crossrpms/cygwin/Makefile.am @@ -35,7 +35,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add cat $(BINUTILS_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/d' \ + -e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ -e "s,rtems[@]osversion[@],rtems,g" \ > $(TARGET)-binutils.spec.in @@ -69,7 +69,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/d' \ + -e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \ -e "s,[=<][ ]*%{newlib_version}-%{release},," \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am index 0e78021ae5..e0e1bcc241 100644 --- a/contrib/crossrpms/freebsd5.2/Makefile.am +++ b/contrib/crossrpms/freebsd5.2/Makefile.am @@ -35,7 +35,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add cat $(BINUTILS_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/d' \ + -e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ -e "s,rtems[@]osversion[@],rtems,g" \ > $(TARGET)-binutils.spec.in @@ -69,7 +69,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/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" \ diff --git a/contrib/crossrpms/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am index 094bc51cda..88e41ef6f4 100644 --- a/contrib/crossrpms/freebsd6.0/Makefile.am +++ b/contrib/crossrpms/freebsd6.0/Makefile.am @@ -35,7 +35,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add cat $(BINUTILS_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/d' \ + -e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ -e "s,rtems[@]osversion[@],rtems,g" \ > $(TARGET)-binutils.spec.in @@ -69,7 +69,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/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" \ diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am index 00beb594e9..943b8d11d1 100644 --- a/contrib/crossrpms/mingw32/Makefile.am +++ b/contrib/crossrpms/mingw32/Makefile.am @@ -16,7 +16,7 @@ LIBS_SUBPACKAGES += target-libs.add $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) cat $(LIBS_SUBPACKAGES) | sed \ - -e '/^%define _prefix.*$$/d' \ + -e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ > $(TARGET)-libs.spec.in CLEANFILES += $(TARGET)-libs.spec.in @@ -41,7 +41,7 @@ W32API_SUBPACKAGES += target-w32api.add $(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES) cat $(W32API_SUBPACKAGES) | sed \ - -e '/^%define _prefix.*$$/d' \ + -e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ > $(TARGET)-w32api.spec.in CLEANFILES += $(TARGET)-w32api.spec.in @@ -70,7 +70,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add cat $(BINUTILS_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/d' \ + -e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ -e "s,rtems[@]osversion[@],rtems,g" \ > $(TARGET)-binutils.spec.in @@ -104,12 +104,12 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/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},," \ - -e "/^%package -n @tool_target@-gcc/d" \ + -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \ -e 's,^%define build_newlib.*$$,%define build_newlib 0,' \ > $(TARGET)-gcc.spec.in CLEANFILES += $(TARGET)-gcc.spec.in diff --git a/contrib/crossrpms/rtems/Makefile.am b/contrib/crossrpms/rtems/Makefile.am index d25b025e94..67c8785e6d 100644 --- a/contrib/crossrpms/rtems/Makefile.am +++ b/contrib/crossrpms/rtems/Makefile.am @@ -20,7 +20,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add cat $(BINUTILS_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/d' \ + -e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ -e "s,rtems[@]osversion[@],rtems,g" \ > $(TARGET)-binutils.spec.in @@ -54,7 +54,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/d' \ + -e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ -e "s,rtems[@]osversion[@],rtems,g" \ -e "/^%package -n @tool_target@-gcc/d" \ diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am index be38a749bb..fc7938de4a 100644 --- a/contrib/crossrpms/solaris2.7/Makefile.am +++ b/contrib/crossrpms/solaris2.7/Makefile.am @@ -35,7 +35,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add cat $(BINUTILS_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./binutils-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/d' \ + -e "s,[@]_prefix[@],$(prefix),g" \ -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ -e "s,rtems[@]osversion[@],rtems,g" \ > $(TARGET)-binutils.spec.in @@ -69,7 +69,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e '/^%define _prefix.*$$/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" \ |