summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorgarbled <garbled@pkgsrc.org>2005-03-12 20:03:38 +0000
committergarbled <garbled@pkgsrc.org>2005-03-12 20:03:38 +0000
commit9e132470569b3ccc172e5fbb83627917c35fe043 (patch)
tree6a9f05d2a02faf06d40ce9a77ab81fe00737d4e2 /mk
parent1e6f1c4e512f0980fdd97711be1f81233887f029 (diff)
downloadpkgsrc-9e132470569b3ccc172e5fbb83627917c35fe043.tar.gz
Some minor hacks for grep and gtar, to use the pkgsrc versions if
available, since the builtin ones aren't so wonderful.
Diffstat (limited to 'mk')
-rw-r--r--mk/platform/AIX.mk18
1 files changed, 11 insertions, 7 deletions
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 84bdfb452b1..9cc0db6b916 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.10 2005/03/12 11:08:04 garbled Exp $
+# $NetBSD: AIX.mk,v 1.11 2005/03/12 20:03:38 garbled Exp $
#
# Variable definitions for the AIX operating system.
@@ -16,32 +16,36 @@ DATE?= /bin/date
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
ECHO_N?= ${ECHO} -n
-.if exists(${LOCALBASE}/bin/egrep)
-EGREP?= ${LOCALBASE}/bin/egrep
+.if exists(${LOCALBASE}/bin/gegrep)
+EGREP?= ${LOCALBASE}/bin/gegrep
.else
EGREP?= /usr/bin/grep -E
.endif
EXPR?= /bin/expr
FALSE?= false # Shell builtin
FETCH_CMD?= ${LOCALBASE}/bin/ftp
-.if exists(${LOCALBASE}/bin/fgrep)
-FGREP?= ${LOCALBASE}/bin/fgrep
+.if exists(${LOCALBASE}/bin/gfgrep)
+FGREP?= ${LOCALBASE}/bin/gfgrep
.else
FGREP?= /usr/bin/grep -F
.endif
FILE_CMD?= /usr/bin/file
FIND?= /usr/bin/find
GMAKE?= ${LOCALBASE}/bin/gmake
-.if exists(${LOCALBASE}/bin/grep)
-GREP?= ${LOCALBASE}/bin/grep
+.if exists(${LOCALBASE}/bin/ggrep)
+GREP?= ${LOCALBASE}/bin/ggrep
.else
GREP?= /usr/bin/grep
.endif
.if exists(/bin/tar)
GTAR?= /bin/tar
.else
+.if exists(${LOCALBASE}/bin/tar)
+GTAR?= ${LOCALBASE}/bin/tar
+.else
GTAR?= /usr/bin/tar
.endif
+.endif
GUNZIP_CMD?= ${LOCALBASE}/bin/gunzip -f
GZCAT?= ${LOCALBASE}/bin/zcat
GZIP?= -9