diff options
author | jschauma <jschauma> | 2003-02-28 03:41:39 +0000 |
---|---|---|
committer | jschauma <jschauma> | 2003-02-28 03:41:39 +0000 |
commit | 13a52bfa5359d253604e84e5c3e51f0827850f1e (patch) | |
tree | ffeb30ec83a0cbb5de7c4d1da517d539e53eb19e | |
parent | f7bac2991ca8ed6c2afcb1be726899c4be142a9e (diff) | |
download | pkgsrc-13a52bfa5359d253604e84e5c3e51f0827850f1e.tar.gz |
Add definitions for HOSTNAME_CMD, so that just-in-time-su doesn't fail
on Irix. Noted and suggested by Pavel Cahyna in a private email.
-rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
-rw-r--r-- | mk/defs.Darwin.mk | 3 | ||||
-rw-r--r-- | mk/defs.FreeBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.IRIX.mk | 3 | ||||
-rw-r--r-- | mk/defs.Linux.mk | 3 | ||||
-rw-r--r-- | mk/defs.NetBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.OpenBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.SunOS.mk | 3 |
8 files changed, 16 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e3f3b12d962..2935737fa4e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1147 2003/02/25 15:23:55 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1148 2003/02/28 03:41:39 jschauma Exp $ # # This file is in the public domain. # @@ -2732,7 +2732,7 @@ _SU_TARGET= \ ${ECHO} "*** WARNING *** Running: ${PRE_ROOT_CMD}"; \ ${PRE_ROOT_CMD}; \ fi; \ - ${ECHO_MSG} "${_PKGSRC_IN}> Becoming root@`/bin/hostname` to $$action ${PKGNAME}."; \ + ${ECHO_MSG} "${_PKGSRC_IN}> Becoming root@`${HOSTNAME_CMD}` to $$action ${PKGNAME}."; \ ${ECHO_MSG} -n "`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'` ";\ ${SU_CMD} "cd ${.CURDIR}; ${SETENV} PATH=$${PATH}:${SU_CMD_PATH_APPEND} ${MAKE} $$args ${MAKEFLAGS} $$realtarget $$realflags"; \ fi diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 5d8ec261f4b..a1b160643a1 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.46 2003/02/26 03:02:59 grant Exp $ +# $NetBSD: defs.Darwin.mk,v 1.47 2003/02/28 03:41:39 jschauma Exp $ # # Variable definitions for the Darwin operating system. @@ -29,6 +29,7 @@ GZCAT?= /usr/bin/gzcat GZIP?= -9 GZIP_CMD?= /usr/bin/gzip -nf ${GZIP} HEAD?= /usr/bin/head +HOSTNAME_CMD?= /bin/hostname ID?= /usr/bin/id LDCONFIG?= /sbin/ldconfig LN?= /bin/ln diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk index 818de21b2ff..95b609ae87d 100644 --- a/mk/defs.FreeBSD.mk +++ b/mk/defs.FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.FreeBSD.mk,v 1.18 2003/02/26 15:15:37 jschauma Exp $ +# $NetBSD: defs.FreeBSD.mk,v 1.19 2003/02/28 03:41:39 jschauma Exp $ # # Variable definitions for the FreeBSD operating system. @@ -33,6 +33,7 @@ GZCAT?= /usr/bin/gzcat GZIP?= -9 GZIP_CMD?= /usr/bin/gzip -nf ${GZIP} HEAD?= /usr/bin/head +HOSTNAME_CMD?= /bin/hostname ID?= /usr/bin/id LDCONFIG?= /sbin/ldconfig LN?= /bin/ln diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk index e355d5735d1..8fb5b87d726 100644 --- a/mk/defs.IRIX.mk +++ b/mk/defs.IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.IRIX.mk,v 1.19 2003/02/26 15:15:38 jschauma Exp $ +# $NetBSD: defs.IRIX.mk,v 1.20 2003/02/28 03:41:39 jschauma Exp $ # # Variable definitions for the IRIX operating system. @@ -38,6 +38,7 @@ GZIP_CMD?= ${LOCALBASE}/bin/gzip -nf ${GZIP} .endif LDCONFIG?= /usr/bin/true HEAD?= /usr/bsd/head +HOSTNAME_CMD?= /usr/bsd/hostname ID?= /usr/bin/id LN?= /sbin/ln LS?= /sbin/ls diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index d974ac58d53..3fc2906fd9c 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.46 2003/02/27 06:05:21 grant Exp $ +# $NetBSD: defs.Linux.mk,v 1.47 2003/02/28 03:41:39 jschauma Exp $ # # Variable definitions for the Linux operating system. @@ -45,6 +45,7 @@ GZCAT?= /bin/zcat GZIP?= -9 GZIP_CMD?= /usr/bin/gzip -nf ${GZIP} HEAD?= /usr/bin/head +HOSTNAME_CMD?= /bin/hostname ID?= /usr/bin/id LDCONFIG?= /sbin/ldconfig LN?= /bin/ln diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index 7e014a853de..441366071ea 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.45 2003/02/24 19:49:47 jschauma Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.46 2003/02/28 03:41:39 jschauma Exp $ # # Variable definitions for the NetBSD operating system. @@ -33,6 +33,7 @@ GZCAT?= /usr/bin/gzcat GZIP?= -9 GZIP_CMD?= /usr/bin/gzip -nf ${GZIP} HEAD?= /usr/bin/head +HOSTNAME_CMD?= /bin/hostname ID?= /usr/bin/id LDCONFIG?= /sbin/ldconfig LN?= /bin/ln diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk index 12047051bf2..c961fdbea5f 100644 --- a/mk/defs.OpenBSD.mk +++ b/mk/defs.OpenBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.OpenBSD.mk,v 1.14 2003/02/24 19:49:47 jschauma Exp $ +# $NetBSD: defs.OpenBSD.mk,v 1.15 2003/02/28 03:41:39 jschauma Exp $ # # Variable definitions for the OpenBSD operating system. @@ -33,6 +33,7 @@ GZCAT?= /usr/bin/gzcat GZIP?= -9 GZIP_CMD?= /usr/bin/gzip -nf ${GZIP} HEAD?= /usr/bin/head +HOSTNAME_CMD?= /bin/hostname ID?= /usr/bin/id LDCONFIG?= /sbin/ldconfig LN?= /bin/ln diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index 8a2a5423228..efd5ce0a335 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.55 2003/02/27 08:15:53 tron Exp $ +# $NetBSD: defs.SunOS.mk,v 1.56 2003/02/28 03:41:39 jschauma Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -40,6 +40,7 @@ GZIP?= -9 GZIP_CMD?= /usr/bin/gzip -nf ${GZIP} .endif HEAD?= /usr/bin/head +HOSTNAME_CMD?= /bin/hostname ID?= /usr/xpg4/bin/id IMAKE?= ${X11BASE}/bin/imake -DHasGcc2=YES -DHasGcc2ForCplusplus=YES LDCONFIG?= /usr/bin/true |