Install libraries in standard libdir

1 files changed, 6 insertions, 7 deletions

diff --git a/build b/build
index 9292a24..ba387e9 100755
--- a/build
+++ b/build
@@ -65,7 +65,6 @@ bootstrap1_opts = \
 	--disable-libssp
 
 libdir    = /usr/lib/$(OPK_HOST_ARCH)
-gcclibdir = /usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)
 tgtlibdir = /usr/lib/$(OPK_HOST_ARCH)/$(target)/gcc-$(base_version)
 tgtincdir = /usr/include/$(target)/c++-$(base_version)
 libsuffix = $$(g++ -print-multi-os-directory)
@@ -182,17 +181,17 @@ $(installnative_targets):
 	mkdir -p $(destdir)$(tgtlibdir)
 	mv $(destdir)$(libdir)/gcc/$(target_gnu)/$(version)/* \
 		$(destdir)$(tgtlibdir)
-	mkdir -p $(destdir)$(gcclibdir)
-	mv $(destdir)$(libdir)/$(libsuffix)/* $(destdir)$(gcclibdir)
+	mkdir -p $(destdir)$(libdir)
+	mv $(destdir)$(libdir)/$(libsuffix)/* $(destdir)$(libdir)
 	mkdir -p $(destdir)$(tgtincdir)
 	mv $(destdir)/usr/include/c++-$(base_version)/$(target_gnu)/* \
 		$(destdir)$(tgtincdir)
 	# Remove libquadmath files.
-	rm -f $(destdir)$(gcclibdir)/libquadmath.*
+	rm -f $(destdir)$(libdir)/libquadmath.*
 	# Remove libtool archives and static libraries.
 	rm -f \
-		$(destdir)$(gcclibdir)/*.la \
-		$(destdir)$(gcclibdir)/*.a \
+		$(destdir)$(libdir)/*.la \
+		$(destdir)$(libdir)/*.a \
 		$(destdir)$(tgtlibdir)/*.la \
 		$(destdir)$(tgtlibdir)/plugin/*.la
 	# Remove the info directory node.
@@ -206,7 +205,7 @@ $(installnative_targets):
 	# target-specific?).
 	rm -Rf $(destdir)$(tgtlibdir)/install-tools/
 	# TODO: Provide these files in a libstdc++-*-dbg package.
-	rm -f $(destdir)$(gcclibdir)/libstdc++.so.*-gdb.py
+	rm -f $(destdir)$(libdir)/libstdc++.so.*-gdb.py
 	rm -Rf $(destdir)/usr/share/gcc-$(version)/python/libstdcxx/
 	# TODO: Provide these files in a doc package.
 	rm -Rf $(destdir)/usr/share/man/ $(destdir)/usr/share/info/