From cb33c79fc801c91f6067a6e2ee825294a0fc4a3f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 7 Aug 2011 03:40:34 +0000 Subject: Eliminate gccexec. --- contrib/crossrpms/gcc/gccnewlib.add | 1 - contrib/crossrpms/gcc/install.add | 2 +- contrib/crossrpms/gcc/target-c++.add | 8 ++++---- contrib/crossrpms/gcc/target-gcc.add | 10 +++++----- contrib/crossrpms/gcc/target-gcj.add | 10 +++++----- contrib/crossrpms/gcc/target-gfortran.add | 8 ++++---- contrib/crossrpms/gcc/target-gnat.add | 8 ++++---- contrib/crossrpms/gcc/target-objc.add | 8 ++++---- 8 files changed, 27 insertions(+), 28 deletions(-) diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index af06973dcf..f50e5d1dd8 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -87,7 +87,6 @@ BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMRE BuildRequires: gmp-devel %endif -%define gccexec %{_libexecdir}/gcc %global _gcclibdir %{_prefix}/lib @SOURCES@ diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index 398e511724..f8a5bf0149 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -57,7 +57,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}%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/@tool_target@/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits; then diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add index 5cd6b004ce..cb27e0a88e 100644 --- a/contrib/crossrpms/gcc/target-c++.add +++ b/contrib/crossrpms/gcc/target-c++.add @@ -27,10 +27,10 @@ GCC c++ compiler for @tool_target@. %{_bindir}/@tool_target@-c++%{_exeext} %{_bindir}/@tool_target@-g++%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/@tool_target@ -%dir %{gccexec}/@tool_target@/%{gcc_version} -%{gccexec}/@tool_target@/%{gcc_version}/cc1plus%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/@tool_target@ +%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} +%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1plus%{_exeext} %dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/c++ diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add index 3aa8453e49..6cc771b5bd 100644 --- a/contrib/crossrpms/gcc/target-gcc.add +++ b/contrib/crossrpms/gcc/target-gcc.add @@ -44,9 +44,9 @@ GNU cc compiler for @tool_target@. %dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/@tool_target@ -%dir %{gccexec}/@tool_target@/%{gcc_version} -%{gccexec}/@tool_target@/%{gcc_version}/cc1%{_exeext} -%{gccexec}/@tool_target@/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/@tool_target@ +%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} +%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/collect2%{_exeext} diff --git a/contrib/crossrpms/gcc/target-gcj.add b/contrib/crossrpms/gcc/target-gcj.add index 051c0d8e0a..c6fc58db03 100644 --- a/contrib/crossrpms/gcc/target-gcj.add +++ b/contrib/crossrpms/gcc/target-gcj.add @@ -39,10 +39,10 @@ This is the gcc/java compiler for @tool_target@ %{_mandir}/man1/@tool_target@-rmi*.1* %endif -%dir %{gccexec} -%dir %{gccexec}/@tool_target@ -%dir %{gccexec}/@tool_target@/%{gcc_version} -%{gccexec}/@tool_target@/%{gcc_version}/jc1%{_exeext} -%{gccexec}/@tool_target@/%{gcc_version}/jvgenmain%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/@tool_target@ +%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} +%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jc1%{_exeext} +%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jvgenmain%{_exeext} %endif diff --git a/contrib/crossrpms/gcc/target-gfortran.add b/contrib/crossrpms/gcc/target-gfortran.add index 44b8dc5219..d53caea8b4 100644 --- a/contrib/crossrpms/gcc/target-gfortran.add +++ b/contrib/crossrpms/gcc/target-gfortran.add @@ -22,9 +22,9 @@ GCC fortran compiler for @tool_target@. %{_mandir}/man1/@tool_target@-gfortran.1* -%dir %{gccexec} -%dir %{gccexec}/@tool_target@ -%dir %{gccexec}/@tool_target@/%{gcc_version} -%{gccexec}/@tool_target@/%{gcc_version}/f951%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/@tool_target@ +%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} +%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/f951%{_exeext} %endif diff --git a/contrib/crossrpms/gcc/target-gnat.add b/contrib/crossrpms/gcc/target-gnat.add index 4296161c32..8e430d8369 100644 --- a/contrib/crossrpms/gcc/target-gnat.add +++ b/contrib/crossrpms/gcc/target-gnat.add @@ -24,10 +24,10 @@ This is the gcc/gnat compiler for @tool_target@. %{_bindir}/@tool_target@-gnat* %{_bindir}/@tool_target@-gprmake%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/@tool_target@ -%dir %{gccexec}/@tool_target@/%{gcc_version} -%{gccexec}/@tool_target@/%{gcc_version}/gnat1%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/@tool_target@ +%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} +%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/gnat1%{_exeext} %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adalib %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adainclude diff --git a/contrib/crossrpms/gcc/target-objc.add b/contrib/crossrpms/gcc/target-objc.add index adf5a27b71..36759f0c85 100644 --- a/contrib/crossrpms/gcc/target-objc.add +++ b/contrib/crossrpms/gcc/target-objc.add @@ -16,10 +16,10 @@ GCC objc compiler for @tool_target@. %files -n @rpmprefix@@tool_target@-gcc-objc -f build/files.objc %defattr(-,root,root) -%dir %{gccexec} -%dir %{gccexec}/@tool_target@ -%dir %{gccexec}/@tool_target@/%{gcc_version} -%{gccexec}/@tool_target@/%{gcc_version}/cc1obj%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/@tool_target@ +%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} +%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1obj%{_exeext} %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/objc %endif -- cgit v1.2.3