From 257a795316d818ba6bbe55042326e90e1b0bf231 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sun, 21 Apr 2013 10:44:09 -0400
Subject: Set libsubdir and libexecsubdir.

---
(limited to 'build')

diff --git a/build b/build
index d4e3e05..c56bebe 100755
--- a/build
+++ b/build
@@ -52,6 +52,8 @@ build: configure
 		>src/$${f}; \
 	done
 	oh-autobuild -B gcc-build -T bootstrap-lean -- -j $${JOBS:-1} \
+		libsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
+		libexecsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
 		toolexeclibdir=/usr/lib/$(OPK_HOST_ARCH) MULTIOSDIR=
 	touch $@
 
@@ -66,12 +68,10 @@ install: build
 	# See also: <http://gcc.gnu.org/ml/gcc/2013-04/msg00171.html>.
 	# TODO: Replace $(OPK_HOST_ARCH) with the target arch.
 	oh-autoinstall -B gcc-build -T install -- \
+		libsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
+		libexecsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
 		toolexeclibdir=/usr/lib/$(OPK_HOST_ARCH) MULTIOSDIR=
 	rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libiberty.a
-	mv dest/usr/lib/$(OPK_HOST_ARCH)/gcc/*/*/ \
-		dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/
-	rmdir dest/usr/lib/$(OPK_HOST_ARCH)/gcc/*/
-	rmdir dest/usr/lib/$(OPK_HOST_ARCH)/gcc/
 
 # POSIX.1-2008:
 #   If the pathname does not begin with a '/' it shall be treated as relative to
--
cgit v0.9.1