From aefc155576954118fc2af198c9060b6dfc5fe422 Mon Sep 17 00:00:00 2001 From: abs Date: Fri, 21 Jun 2002 17:28:44 +0000 Subject: Linux updates: match MTREE value in pkg_install, pass correct arg to patch to create .orig files, and update ZOULARISBASE to /usr/pkg --- mk/defs.Linux.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mk/defs.Linux.mk') diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index 8aebc45ba80..7e0ff5c7753 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.26 2002/06/02 00:40:19 schmonz Exp $ +# $NetBSD: defs.Linux.mk,v 1.27 2002/06/21 17:28:44 abs Exp $ # # Variable definitions for the Linux operating system. @@ -31,7 +31,7 @@ LDCONFIG?= /sbin/ldconfig LN?= /bin/ln LS?= /bin/ls MKDIR?= /bin/mkdir -p -MTREE?= ${ZOULARISBASE}/bin/mtree +MTREE?= ${ZOULARISBASE}/sbin/mtree MV?= /bin/mv PATCH?= /usr/bin/patch PAX?= ${ZOULARISBASE}/bin/pax @@ -66,12 +66,12 @@ GROUPADD?= /usr/sbin/groupadd MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type NOLOGIN?= ${FALSE} -PKG_TOOLS_BIN?= ${ZOULARISBASE}/bin +PKG_TOOLS_BIN?= ${ZOULARISBASE}/sbin ROOT_GROUP?= wheel ROOT_USER?= root SERIAL_DEVICES?= /dev/null USERADD?= /usr/sbin/useradd -ZOULARISBASE?= ${DESTDIR}/usr/local/bsd +ZOULARISBASE?= /usr/pkg _DO_LIBINTL_CHECKS= no # perform checks for valid libintl _DO_SHLIB_CHECKS= no # on installation, fixup PLIST for shared libs @@ -79,7 +79,7 @@ _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake _OPSYS_HAS_GMAKE= yes # GNU make is standard _OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages _OPSYS_HAS_OSSAUDIO= no # libossaudio is available -_PATCH_BACKUP_ARG= -V simple -z # switch to patch(1) for backup suffix +_PATCH_BACKUP_ARG= -b -V simple -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_RPATH= yes # add rpath to LDFLAGS -- cgit v1.2.3