--- elwix/build_base.sh	2017/02/13 16:52:46	1.4
+++ elwix/build_base.sh	2017/06/15 22:34:29	1.4.2.3
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_base.sh,v 1.4 2017/02/13 16:52:46 misho Exp $
+# $Id: build_base.sh,v 1.4.2.3 2017/06/15 22:34:29 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -72,11 +72,7 @@ build_basefs()
 	install -d -m 0750 elwix/root/.ssh;
 	install -d elwix/tftpboot;
 	install -d elwix/pkg;
-	install -d elwix/pkg/bin;
-	install -d elwix/pkg/lib;
-	install -d elwix/pkg/libexec;
-	install -d elwix/pkg/libdata;
-	install -d elwix/pkg/sbin;
+	install -d elwix/local;
 	ln -fs /elwix/etc etc;
 	ln -fs /elwix/exports exports;
 	ln -fs /elwix/home home;
@@ -92,16 +88,18 @@ build_basefs()
 	ln -fs /usr/lib lib;
 	install -d usr/lib/engines;
 	install -d usr/lib/geom;
-	install -d usr/lib32;
+	case ${TARGET} in
+		amd64)
+			install -d usr/lib32;
+			;;
+		*)
+			;;
+	esac
 	install -d usr/libdata;
 	install -d usr/libexec;
 	ln -fs /usr/libexec libexec;
-	install -d usr/local;
-	install -d usr/local/bin;
-	install -d usr/local/lib;
-	install -d usr/local/libexec;
-	install -d usr/local/libdata;
-	install -d usr/local/sbin;
+	ln -fs /elwix/local usr/local;
+	ln -fs /elwix/pkg usr/pkg;
 	install -d usr/sbin;
 	install -d usr/share;
 	install -d usr/share/misc;