Eliminate %{gccexec}.

8 files changed, 27 insertions, 28 deletions

diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add
index 74ed17a307..f5f9f97122 100644
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ b/contrib/crossrpms/gcc/gccnewlib.add
@@ -121,7 +121,6 @@ BuildRequires:	@rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMRE
 %endif
 
 %define gcclib %{_libdir}/gcc
-%define gccexec %{_libexecdir}/gcc
 
 @SOURCES@
 
diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add
index d6c2173915..4ebbad5693 100644
--- a/contrib/crossrpms/gcc/install.add
+++ b/contrib/crossrpms/gcc/install.add
@@ -60,7 +60,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}%{gccexec}/@tool_target@/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/install-tools
 %endif
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add
index 38900f4ff5..75f9d654b5 100644
--- a/contrib/crossrpms/gcc/target-c++.add
+++ b/contrib/crossrpms/gcc/target-c++.add
@@ -29,10 +29,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 %{gcclib}/@tool_target@/%{gcc_version}/include
 %{gcclib}/@tool_target@/%{gcc_version}/include/c++
diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add
index 0e4fc99cb4..7fa74a65df 100644
--- a/contrib/crossrpms/gcc/target-gcc.add
+++ b/contrib/crossrpms/gcc/target-gcc.add
@@ -48,9 +48,9 @@ GNU cc compiler for @tool_target@.
 %dir %{gcclib}/@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 d74078ae44..39da2c9e04 100644
--- a/contrib/crossrpms/gcc/target-gcj.add
+++ b/contrib/crossrpms/gcc/target-gcj.add
@@ -44,11 +44,11 @@ This is the gcc/java compiler for @tool_target@
 %endif
 %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 c83f05baa3..d30f2a794f 100644
--- a/contrib/crossrpms/gcc/target-gfortran.add
+++ b/contrib/crossrpms/gcc/target-gfortran.add
@@ -26,10 +26,10 @@ 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}
 
 %{gcclib}/@tool_target@/%{gcc_version}/finclude
 %endif
diff --git a/contrib/crossrpms/gcc/target-gnat.add b/contrib/crossrpms/gcc/target-gnat.add
index bd6482380e..eb51575ab7 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}
 
 %{gcclib}/@tool_target@/%{gcc_version}/adalib
 %{gcclib}/@tool_target@/%{gcc_version}/adainclude
diff --git a/contrib/crossrpms/gcc/target-objc.add b/contrib/crossrpms/gcc/target-objc.add
index ba29807221..eaa3a58605 100644
--- a/contrib/crossrpms/gcc/target-objc.add
+++ b/contrib/crossrpms/gcc/target-objc.add
@@ -18,10 +18,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}
 
 %{gcclib}/@tool_target@/%{gcc_version}/include/objc
 %endif