Fix multilib.
This commit is contained in:
parent
5ebefb7794
commit
0e14742783
3
mk/os.mk
3
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
|
||||
|
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user