From 0a1e65e421d5da7e3809e0ae9ed087f6dd5a88b4 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Mon, 3 Aug 2009 15:36:58 +0000 Subject: - Move pkg_install commands detection to bsd.commands.mk PR: 135663 Submitted: Yuri Pankov - Add default FLEX command to bsd.commands.mk PR: 137026 Submitted: gahr@ Tested by: pointyhat exp-build run --- Mk/bsd.commands.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'Mk/bsd.commands.mk') diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk index 2114f0b769d0..2320597ee130 100644 --- a/Mk/bsd.commands.mk +++ b/Mk/bsd.commands.mk @@ -41,6 +41,7 @@ EXPR?= /bin/expr FALSE?= false # Shell builtin FILE?= /usr/bin/file FIND?= /usr/bin/find +FLEX?= /usr/bin/flex FMT?= /usr/bin/fmt GMAKE?= gmake GREP?= /usr/bin/grep @@ -113,4 +114,18 @@ ECHO_CMD?= echo # Shell builtin # Used to print all the '===>' style prompts - override this to turn them off. ECHO_MSG?= ${ECHO_CMD} +.if exists(${LOCALBASE}/sbin/pkg_info) +PKG_CMD?= ${LOCALBASE}/sbin/pkg_create +PKG_ADD?= ${LOCALBASE}/sbin/pkg_add +PKG_DELETE?= ${LOCALBASE}/sbin/pkg_delete +PKG_INFO?= ${LOCALBASE}/sbin/pkg_info +PKG_VERSION?= ${LOCALBASE}/sbin/pkg_version +.else +PKG_CMD?= /usr/sbin/pkg_create +PKG_ADD?= /usr/sbin/pkg_add +PKG_DELETE?= /usr/sbin/pkg_delete +PKG_INFO?= /usr/sbin/pkg_info +PKG_VERSION?= /usr/sbin/pkg_version +.endif + .endif -- cgit v1.2.3