From 0e147427837fbb7e3d15f19507f64bed3ea5d83c Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Tue, 4 Mar 2008 20:44:39 +0000
Subject: Fix multilib.

---
 mk/os.mk  | 3 ---
 mk/sys.mk | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'mk')

diff --git a/mk/os.mk b/mk/os.mk
index e4f3c76..f49ed6c 100644
--- a/mk/os.mk
+++ b/mk/os.mk
@@ -13,9 +13,6 @@ _SUBOS_SH=	case `uname -s` in \
 _SUBOS!=	${_SUBOS_SH}
 SUBOS?=		${_SUBOS}$(shell ${_SUBOS_SH})
 
-_LIBNAME_SH=	l=`readlink /lib`; case "$$l" in /lib64|lib64) echo "lib64";; *) echo "lib";; esac
-_LIBNAME!=	${_LIBNAME_SH}
-LIBNAME?=	${_LIBNAME}$(shell ${_LIBNAME_SH})
 RC_LIB=		/$(LIBNAME)/rc
 
 _DEF_SH=	case `uname -s` in Linux) echo "-D_BSD_SOURCE -D_XOPEN_SOURCE=600";; *) echo;; esac
diff --git a/mk/sys.mk b/mk/sys.mk
index 2e62b65..6c132bb 100644
--- a/mk/sys.mk
+++ b/mk/sys.mk
@@ -21,7 +21,9 @@ BINMODE?=		0755
 INCDIR?=		${UPREFIX}/include
 INCMODE?=		0444
 
-LIBNAME?=		lib
+_LIBNAME_SH=		case `readlink /lib` in /lib64|lib64) echo "lib64";; *) echo "lib";; esac
+_LIBNAME!=		${_LIBNAME_SH}
+LIBNAME?=		${_LIBNAME}$(shell ${_LIBNAME_SH})
 LIBDIR?=		${UPREFIX}/${LIBNAME}
 LIBMODE?=		0444
 SHLIBDIR?=		${PREFIX}/${LIBNAME}
-- 
cgit v1.2.3