summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-03-04 20:44:39 +0000
committerRoy Marples <roy@marples.name>2008-03-04 20:44:39 +0000
commit0e147427837fbb7e3d15f19507f64bed3ea5d83c (patch)
treea48f44a82db4d95dd688b37f649a063ba5e0e480 /mk
parent5ebefb7794a35cb577271575af67363f150d7c7d (diff)
downloadopenrc-0e147427837fbb7e3d15f19507f64bed3ea5d83c.tar.gz
openrc-0e147427837fbb7e3d15f19507f64bed3ea5d83c.tar.bz2
openrc-0e147427837fbb7e3d15f19507f64bed3ea5d83c.tar.xz
Fix multilib.
Diffstat (limited to 'mk')
-rw-r--r--mk/os.mk3
-rw-r--r--mk/sys.mk4
2 files changed, 3 insertions, 4 deletions
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}