diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-03-06 12:15:22 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-03-06 12:15:22 +0000 |
| commit | 58255f77c1e23dc750bb2b9c37a7f275e4d416ad (patch) | |
| tree | ccf4da1015bdfd3738a43c2759201fe3d56f40d7 /contrib | |
| parent | 2007-03-05 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-58255f77c1e23dc750bb2b9c37a7f275e4d416ad.tar.bz2 | |
Add exec_prefix.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/gcc/build.add | 3 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/install.add | 6 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/rpm-install.add | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/target-newlib.add | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add index 4528161686..70f1c0dff0 100644 --- a/contrib/crossrpms/gcc/build.add +++ b/contrib/crossrpms/gcc/build.add @@ -33,6 +33,7 @@ ../gcc-%{gcc_pkgvers}/configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ + --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ --libdir=%{_libdir} \ --mandir=%{_mandir} \ @@ -47,7 +48,7 @@ --disable-win32-registry \ --enable-version-specific-runtime-libs \ --enable-threads \ - --with-sysroot=%{_prefix}/@tool_target@/sys-root \ + --with-sysroot=%{_exec_prefix}/@tool_target@/sys-root \ --enable-languages="$languages" $optargs %if "%_host" != "%_build" diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index 2863e4f781..542bab8e23 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -24,7 +24,7 @@ %endif # host library - rm -f ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a + rm -f ${RPM_BUILD_ROOT}%{_exec_prefix}/lib/libiberty.a # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-c++filt%{_exeext} @@ -68,7 +68,7 @@ %if %build_newlib echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_prefix}/@tool_target@/lib" + TGTDIR="%{_exec_prefix}/@tool_target@/lib" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> build/files.newlib @@ -136,7 +136,7 @@ esac done - TGTDIR="%{_prefix}/@tool_target@/lib" + TGTDIR="%{_exec_prefix}/@tool_target@/lib" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in diff --git a/contrib/crossrpms/gcc/rpm-install.add b/contrib/crossrpms/gcc/rpm-install.add index f8d012f8fc..002ecff610 100644 --- a/contrib/crossrpms/gcc/rpm-install.add +++ b/contrib/crossrpms/gcc/rpm-install.add @@ -33,7 +33,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/(lib|include|sys-root)' \ +grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \ | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -41,7 +41,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/(lib|include|sys-root)' \ +grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \ | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires diff --git a/contrib/crossrpms/gcc/target-newlib.add b/contrib/crossrpms/gcc/target-newlib.add index fc4fec232d..e40908d21a 100644 --- a/contrib/crossrpms/gcc/target-newlib.add +++ b/contrib/crossrpms/gcc/target-newlib.add @@ -21,7 +21,7 @@ Newlib C Library for @tool_target@. %files -n @rpmprefix@@tool_target@-newlib -f build/files.newlib %defattr(-,root,root) %sysdir %{_prefix} -%dir %{_prefix}/@tool_target@ -%{_prefix}/@tool_target@/include +%dir %{_exec_prefix}/@tool_target@ +%{_exec_prefix}/@tool_target@/include %endif |