diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec
index ea89bf5..34508a2 100644
--- a/cross-aarch64-gcc7.spec
+++ b/cross-aarch64-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec
index 6ea73cc..1f60303 100644
--- a/cross-arm-gcc7.spec
+++ b/cross-arm-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec
index e14a6e4..a01f3e3 100644
--- a/cross-avr-gcc7-bootstrap.spec
+++ b/cross-avr-gcc7-bootstrap.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec
index 7f43cfb..8c88243 100644
--- a/cross-avr-gcc7.spec
+++ b/cross-avr-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec
index 183dfae..91f6c5c 100644
--- a/cross-epiphany-gcc7-bootstrap.spec
+++ b/cross-epiphany-gcc7-bootstrap.spec
@@ -607,7 +607,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec
index 15cb1ea..abad368 100644
--- a/cross-epiphany-gcc7.spec
+++ b/cross-epiphany-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec
index 7539c72..fc3b3d6 100644
--- a/cross-hppa-gcc7.spec
+++ b/cross-hppa-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec
index 0734f8b..8ade498 100644
--- a/cross-i386-gcc7.spec
+++ b/cross-i386-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec
index 4b2c985..9d77f21 100644
--- a/cross-m68k-gcc7.spec
+++ b/cross-m68k-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec
index a4946ab..baaf5d0 100644
--- a/cross-mips-gcc7.spec
+++ b/cross-mips-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec
index 357d507..4475de2 100644
--- a/cross-nvptx-gcc7.spec
+++ b/cross-nvptx-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec
index 3c09c34..b10e6df 100644
--- a/cross-ppc64-gcc7.spec
+++ b/cross-ppc64-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec
index 1751ab2..5239638 100644
--- a/cross-ppc64le-gcc7.spec
+++ b/cross-ppc64le-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec
index b3f7b8a..71db5bc 100644
--- a/cross-rx-gcc7-bootstrap.spec
+++ b/cross-rx-gcc7-bootstrap.spec
@@ -607,7 +607,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec
index cf36de5..13afe7a 100644
--- a/cross-rx-gcc7.spec
+++ b/cross-rx-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec
index 1a90065..81e0e4d 100644
--- a/cross-s390x-gcc7.spec
+++ b/cross-s390x-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec
index 1a99de2..43abf47 100644
--- a/cross-sparc-gcc7.spec
+++ b/cross-sparc-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec
index e6e8ea2..a25327e 100644
--- a/cross-sparc64-gcc7.spec
+++ b/cross-sparc64-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec
index 5c9afe6..3fb957f 100644
--- a/cross-x86_64-gcc7.spec
+++ b/cross-x86_64-gcc7.spec
@@ -606,7 +606,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif
 
diff --git a/cross.spec.in b/cross.spec.in
index d86be18..5a6f47a 100644
--- a/cross.spec.in
+++ b/cross.spec.in
@@ -185,7 +185,7 @@ make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 
 %if 0%{?binutils_os:1}
 for prog in as ld; do
-  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{libsubdir}/
+  ln -s /usr/%{binutils_os}/bin/$prog $RPM_BUILD_ROOT%{targetlibsubdir}/
 done
 %endif