diff options
| author | grant <grant> | 2004-02-14 03:26:09 +0000 |
|---|---|---|
| committer | grant <grant> | 2004-02-14 03:26:09 +0000 |
| commit | 63f0fe1817851233e09df823842933a602d14a13 (patch) | |
| tree | 0a0d8285b7065135afa920b361aa93034a68e680 /mk/defs.SunOS.mk | |
| parent | bf5e517fd8c0a5eef41994822a3aada469eee2f6 (diff) | |
| download | pkgsrc-63f0fe1817851233e09df823842933a602d14a13.tar.gz | |
deprecate Zoularis: remove any tests for ZOULARIS* and bomb if
${LOCALBASE}/bsd/share/mk/zoularis.mk exists.
Diffstat (limited to 'mk/defs.SunOS.mk')
| -rw-r--r-- | mk/defs.SunOS.mk | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index 258e8308069..3dee5504599 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.79 2004/02/14 00:11:30 grant Exp $ +# $NetBSD: defs.SunOS.mk,v 1.80 2004/02/14 03:26:09 grant Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -26,7 +26,7 @@ GREP?= /usr/xpg4/bin/grep .if exists(${LOCALBASE}/bin/gtar) GTAR?= ${LOCALBASE}/bin/gtar .else -GTAR?= ${ZOULARISBASE}/bin/tar +GTAR?= ${LOCALBASE}/bin/tar .endif .if exists(${LOCALBASE}/bin/gzip) GUNZIP_CMD?= ${LOCALBASE}/bin/gunzip -f @@ -49,10 +49,7 @@ LS?= /usr/bin/ls M4?= /usr/ccs/bin/m4 MAIL_CMD?= /usr/bin/mailx MKDIR?= /usr/bin/mkdir -p -.if exists(${LOCALBASE}/sbin/mtree) MTREE?= ${LOCALBASE}/sbin/mtree -.endif -MTREE?= ${ZOULARISBASE}/bin/mtree MV?= /usr/bin/mv NICE?= /usr/xpg4/bin/nice .if exists(/usr/bin/gpatch) @@ -181,16 +178,9 @@ _STRIPFLAG_INSTALL?= -s # install(1) option to strip .endif LOCALBASE?= ${DESTDIR}/usr/pkg -.if !defined(ZOULARISBASE) -. if exists(${LOCALBASE}/bsd) -ZOULARISBASE:= ${LOCALBASE}/bsd -. else -ZOULARISBASE:= ${LOCALBASE} -. endif -.endif + .if exists(${LOCALBASE}/sbin/pkg_info) PKG_TOOLS_BIN?= ${LOCALBASE}/sbin -.elif exists(${ZOULARISBASE}/sbin/pkg_info) -PKG_TOOLS_BIN?= ${ZOULARISBASE}/sbin +.else +PKG_TOOLS_BIN?= ${LOCALBASE}/bin .endif -PKG_TOOLS_BIN?= ${ZOULARISBASE}/bin |