From 22b7a12b6e1f55f536b9004dd78ab67e88deaf6a Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 10 Jan 2008 19:50:01 +0000 Subject: [PATCH] Fix SUBOS_SH --- mk/os.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mk/os.mk b/mk/os.mk index 2c4455c3..2de3bc61 100644 --- a/mk/os.mk +++ b/mk/os.mk @@ -2,21 +2,21 @@ # Generic definitions -_OS_SH_= uname -s -_OS!= ${_OS_SH} -OS?= ${_OS}$(shell ${_OS_SH}) +_OS_SH= uname -s +_OS!= ${_OS_SH} +OS?= ${_OS}$(shell ${_OS_SH}) -_SUBOS_SH= case `uname -s` in \ - *BSD|DragonFly) echo "BSD";; \ - *) uname -s;; \ - esac -_SUBOS!= ${_SUBOS_SH} +_SUBOS_SH= case `uname -s` in \ + *BSD|DragonFly) echo "BSD";; \ + *) uname -s;; \ + esac +_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 +_LIBNAME!= ${_LIBNAME_SH} +LIBNAME?= ${_LIBNAME}$(shell ${_LIBNAME_SH}) +RC_LIB= /$(LIBNAME)/rc _DEF_SH= case `uname -s` in Linux) echo "-D_XOPEN_SOURCE=600 -D_BSD_SOURCE";; *) echo;; esac _DEF!= ${_DEF_SH}