mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2025-12-09 17:12:58 +00:00
Propagate $prefix as %_prefix
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
# or mailto:rtems-bugs@rtems.com
|
# or mailto:rtems-bugs@rtems.com
|
||||||
#
|
#
|
||||||
|
|
||||||
%define _prefix /usr
|
%define _prefix @_prefix@
|
||||||
%if "%{_prefix}" != "/usr"
|
%if "%{_prefix}" != "/usr"
|
||||||
%define _infodir %{_prefix}/info
|
%define _infodir %{_prefix}/info
|
||||||
%define _mandir %{_prefix}/man
|
%define _mandir %{_prefix}/man
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
|
|||||||
cat $(BINUTILS_SUBPACKAGES) | sed \
|
cat $(BINUTILS_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
-e "s,rtems[@]osversion[@],rtems,g" \
|
-e "s,rtems[@]osversion[@],rtems,g" \
|
||||||
> $(TARGET)-binutils.spec.in
|
> $(TARGET)-binutils.spec.in
|
||||||
@@ -69,7 +69,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
|
|||||||
cat $(GCC_SUBPACKAGES) | sed \
|
cat $(GCC_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
|
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
|
||||||
-e "s,[=<][ ]*%{newlib_version}-%{release},," \
|
-e "s,[=<][ ]*%{newlib_version}-%{release},," \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
|
|||||||
cat $(BINUTILS_SUBPACKAGES) | sed \
|
cat $(BINUTILS_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
-e "s,rtems[@]osversion[@],rtems,g" \
|
-e "s,rtems[@]osversion[@],rtems,g" \
|
||||||
> $(TARGET)-binutils.spec.in
|
> $(TARGET)-binutils.spec.in
|
||||||
@@ -69,7 +69,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
|
|||||||
cat $(GCC_SUBPACKAGES) | sed \
|
cat $(GCC_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
-e "s,rtems[@]osversion[@],rtems,g" \
|
-e "s,rtems[@]osversion[@],rtems,g" \
|
||||||
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
|
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
|
|||||||
cat $(BINUTILS_SUBPACKAGES) | sed \
|
cat $(BINUTILS_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
-e "s,rtems[@]osversion[@],rtems,g" \
|
-e "s,rtems[@]osversion[@],rtems,g" \
|
||||||
> $(TARGET)-binutils.spec.in
|
> $(TARGET)-binutils.spec.in
|
||||||
@@ -69,7 +69,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
|
|||||||
cat $(GCC_SUBPACKAGES) | sed \
|
cat $(GCC_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
-e "s,rtems[@]osversion[@],rtems,g" \
|
-e "s,rtems[@]osversion[@],rtems,g" \
|
||||||
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
|
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ LIBS_SUBPACKAGES += target-libs.add
|
|||||||
|
|
||||||
$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES)
|
$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES)
|
||||||
cat $(LIBS_SUBPACKAGES) | sed \
|
cat $(LIBS_SUBPACKAGES) | sed \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
> $(TARGET)-libs.spec.in
|
> $(TARGET)-libs.spec.in
|
||||||
CLEANFILES += $(TARGET)-libs.spec.in
|
CLEANFILES += $(TARGET)-libs.spec.in
|
||||||
@@ -41,7 +41,7 @@ W32API_SUBPACKAGES += target-w32api.add
|
|||||||
|
|
||||||
$(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES)
|
$(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES)
|
||||||
cat $(W32API_SUBPACKAGES) | sed \
|
cat $(W32API_SUBPACKAGES) | sed \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
> $(TARGET)-w32api.spec.in
|
> $(TARGET)-w32api.spec.in
|
||||||
CLEANFILES += $(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 \
|
cat $(BINUTILS_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
-e "s,rtems[@]osversion[@],rtems,g" \
|
-e "s,rtems[@]osversion[@],rtems,g" \
|
||||||
> $(TARGET)-binutils.spec.in
|
> $(TARGET)-binutils.spec.in
|
||||||
@@ -104,12 +104,12 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
|
|||||||
cat $(GCC_SUBPACKAGES) | sed \
|
cat $(GCC_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
-e "s,rtems[@]osversion[@],rtems,g" \
|
-e "s,rtems[@]osversion[@],rtems,g" \
|
||||||
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
|
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
|
||||||
-e "s,[=<][ ]*%{newlib_version}-%{release},," \
|
-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,' \
|
-e 's,^%define build_newlib.*$$,%define build_newlib 0,' \
|
||||||
> $(TARGET)-gcc.spec.in
|
> $(TARGET)-gcc.spec.in
|
||||||
CLEANFILES += $(TARGET)-gcc.spec.in
|
CLEANFILES += $(TARGET)-gcc.spec.in
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
|
|||||||
cat $(BINUTILS_SUBPACKAGES) | sed \
|
cat $(BINUTILS_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
-e "s,rtems[@]osversion[@],rtems,g" \
|
-e "s,rtems[@]osversion[@],rtems,g" \
|
||||||
> $(TARGET)-binutils.spec.in
|
> $(TARGET)-binutils.spec.in
|
||||||
@@ -54,7 +54,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
|
|||||||
cat $(GCC_SUBPACKAGES) | sed \
|
cat $(GCC_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
-e "s,rtems[@]osversion[@],rtems,g" \
|
-e "s,rtems[@]osversion[@],rtems,g" \
|
||||||
-e "/^%package -n @tool_target@-gcc/d" \
|
-e "/^%package -n @tool_target@-gcc/d" \
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
|
|||||||
cat $(BINUTILS_SUBPACKAGES) | sed \
|
cat $(BINUTILS_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
-e "/[@]SOURCES[@]/r ./binutils-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
-e "s,rtems[@]osversion[@],rtems,g" \
|
-e "s,rtems[@]osversion[@],rtems,g" \
|
||||||
> $(TARGET)-binutils.spec.in
|
> $(TARGET)-binutils.spec.in
|
||||||
@@ -69,7 +69,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
|
|||||||
cat $(GCC_SUBPACKAGES) | sed \
|
cat $(GCC_SUBPACKAGES) | sed \
|
||||||
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
-e "/[@]SOURCES[@]/r ./gcc-sources.add" \
|
||||||
-e "/[@]SOURCES[@]/d" \
|
-e "/[@]SOURCES[@]/d" \
|
||||||
-e '/^%define _prefix.*$$/d' \
|
-e "s,[@]_prefix[@],$(prefix),g" \
|
||||||
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
|
||||||
-e "s,rtems[@]osversion[@],rtems,g" \
|
-e "s,rtems[@]osversion[@],rtems,g" \
|
||||||
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
|
-e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
|
||||||
|
|||||||
Reference in New Issue
Block a user