1.1 --- a/make/common/shared/Defs-utils.gmk Fri Feb 24 18:22:48 2012 -0800
1.2 +++ b/make/common/shared/Defs-utils.gmk Tue Mar 06 20:25:43 2012 +0000
1.3 @@ -31,7 +31,7 @@
1.4 # These input UTILS_* variables can be defined at anytime, ideally once.
1.5 # Unix Commands: Normally /bin/, /usr/bin/. or C:/mksnt/mksnt/
1.6 # UTILS_COMMAND_PATH
1.7 -# /usr/bin/
1.8 +# /usr/bin/
1.9 # UTILS_USR_BIN_PATH
1.10 # /usr/ccs/bin/ (sccs, m4, lex, yacc, as, ar, strip, mcs)
1.11 # UTILS_CCS_BIN_PATH
1.12 @@ -53,6 +53,13 @@
1.13 UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
1.14 endif
1.15
1.16 +ifeq ($(PLATFORM),bsd)
1.17 + UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
1.18 + UTILS_USR_BIN_PATH=$(USRBIN_PATH)
1.19 + UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
1.20 + UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
1.21 +endif
1.22 +
1.23 ifeq ($(PLATFORM),solaris)
1.24 UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
1.25 UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
1.26 @@ -166,15 +173,15 @@
1.27 # Also, some distribution (Ubuntu, Debian, others?) place the rpm command
1.28 # itself in /usr/bin rather than it's traditional home in /bin.
1.29 RPM=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpm) \
1.30 - $(wildcard $(UTILS_USR_BIN_PATH)rpm))
1.31 + $(wildcard $(UTILS_USR_BIN_PATH)rpm))
1.32 RPMBUILD=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpmbuild) \
1.33 - $(wildcard $(UTILS_USR_BIN_PATH)rpmbuild) \
1.34 - $(wildcard $(UTILS_COMMAND_PATH)rpm) \
1.35 - $(wildcard $(UTILS_USR_BIN_PATH)rpm))
1.36 + $(wildcard $(UTILS_USR_BIN_PATH)rpmbuild) \
1.37 + $(wildcard $(UTILS_COMMAND_PATH)rpm) \
1.38 + $(wildcard $(UTILS_USR_BIN_PATH)rpm))
1.39 # Most Linux distros have "sort" in /bin. Ubuntu, Debian and perhaps
1.40 # others have it in /usr/bin.
1.41 SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
1.42 - $(wildcard $(UTILS_USR_BIN_PATH)sort))
1.43 + $(wildcard $(UTILS_USR_BIN_PATH)sort))
1.44 NAWK = $(USRBIN_PATH)gawk
1.45 # Intrinsic unix command, with backslash-escaped character interpretation
1.46 ECHO = /bin/echo -e
1.47 @@ -198,3 +205,34 @@
1.48 ECHO = /usr/bin/echo
1.49 endif
1.50
1.51 +# BSD specific
1.52 +ifeq ($(PLATFORM),bsd)
1.53 + BASENAME = $(UTILS_USR_BIN_PATH)basename
1.54 + EGREP = $(UTILS_USR_BIN_PATH)egrep
1.55 + EXPR = $(UTILS_COMMAND_PATH)expr
1.56 + FMT = $(UTILS_USR_BIN_PATH)fmt
1.57 + GREP = $(UTILS_USR_BIN_PATH)grep
1.58 + GUNZIP = $(UTILS_USR_BIN_PATH)gunzip
1.59 + ID = $(UTILS_USR_BIN_PATH)id
1.60 + MSGFMT = $(UTILS_DEVTOOL_PATH)msgfmt
1.61 + SED = $(UTILS_USR_BIN_PATH)sed
1.62 + SORT = $(UTILS_USR_BIN_PATH)sort
1.63 + TEST = $(UTILS_COMMAND_PATH)test
1.64 + TOUCH = $(UTILS_USR_BIN_PATH)touch
1.65 + TRUE = $(UTILS_USR_BIN_PATH)true
1.66 + UNAME = $(UTILS_USR_BIN_PATH)uname
1.67 + # BSD OS_VENDOR specific
1.68 + ifeq ($(OS_VENDOR), Apple)
1.69 + NAWK = $(UTILS_USR_BIN_PATH)awk
1.70 + UNZIPSFX = $(UTILS_USR_BIN_PATH)unzipsfx
1.71 + ZIPEXE = $(UTILS_USR_BIN_PATH)zip
1.72 + else
1.73 + UNZIP = $(UTILS_DEVTOOL_PATH)unzip
1.74 + endif
1.75 + ifeq ($(OS_VENDOR), OpenBSD)
1.76 + NAWK = $(UTILS_USR_BIN_PATH)awk
1.77 + else
1.78 + CPIO = $(UTILS_USR_BIN_PATH)cpio
1.79 + TAR = $(UTILS_USR_BIN_PATH)tar
1.80 + endif
1.81 +endif
