diff options
Diffstat (limited to 'contrib/crossrpms/gcc/install.add')
| -rw-r--r-- | contrib/crossrpms/gcc/install.add | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index 55ba310c95..398e511724 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -19,7 +19,7 @@ # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/@tool_target@/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/ fi %endif @@ -56,7 +56,7 @@ # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/install-tools rm -rf ${RPM_BUILD_ROOT}%{gccexec}/@tool_target@/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory @@ -89,10 +89,10 @@ echo "%dir %{_libexecdir}" >> dirs %endif %endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/@tool_target@" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/@tool_target@" >> dirs - TGTDIR="%{gcclib}/@tool_target@/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -109,7 +109,7 @@ cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/@tool_target@/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in |