diff options
author | seb <seb@pkgsrc.org> | 2003-03-04 14:50:09 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2003-03-04 14:50:09 +0000 |
commit | 89dce5e7f1a34dcb06e3e0a277f711eeff1713c5 (patch) | |
tree | 20ff8b85eea6cd8cf1dfe978609c7a6633894bda /mk | |
parent | 347d0c5655b1558c5e84a47b8ff5d1054569f2dc (diff) | |
download | pkgsrc-89dce5e7f1a34dcb06e3e0a277f711eeff1713c5.tar.gz |
Move M4 default definition into the defs.$OPSYS.mk files: unconditionally
set it to /usr/bin/m4 for everyone, at least for now.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 6 | ||||
-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, 15 insertions, 12 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6cb7c976d0c..d2d00bcc8ee 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1149 2003/03/03 19:41:27 seb Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1150 2003/03/04 14:50:09 seb Exp $ # # This file is in the public domain. # @@ -269,10 +269,6 @@ SHCOMMENT?= ${ECHO_MSG} >/dev/null '***' DISTINFO_FILE?= ${.CURDIR}/distinfo -.if exists(/usr/bin/m4) -M4?= /usr/bin/m4 -.endif - .if defined(USE_X11) X11_LDFLAGS= # empty . if ${_USE_RPATH} == "yes" diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index a1b160643a1..31bbb55e267 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.47 2003/02/28 03:41:39 jschauma Exp $ +# $NetBSD: defs.Darwin.mk,v 1.48 2003/03/04 14:50:10 seb Exp $ # # Variable definitions for the Darwin operating system. @@ -34,6 +34,7 @@ ID?= /usr/bin/id LDCONFIG?= /sbin/ldconfig LN?= /bin/ln LS?= /bin/ls +M4?= /usr/bin/m4 MKDIR?= /bin/mkdir -p MTREE?= /usr/sbin/mtree MV?= /bin/mv diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk index 95b609ae87d..315b22ec4c5 100644 --- a/mk/defs.FreeBSD.mk +++ b/mk/defs.FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.FreeBSD.mk,v 1.19 2003/02/28 03:41:39 jschauma Exp $ +# $NetBSD: defs.FreeBSD.mk,v 1.20 2003/03/04 14:50:11 seb Exp $ # # Variable definitions for the FreeBSD operating system. @@ -38,6 +38,7 @@ ID?= /usr/bin/id LDCONFIG?= /sbin/ldconfig LN?= /bin/ln LS?= /bin/ls +M4?= /usr/bin/m4 MKDIR?= /bin/mkdir -p .if exists(${LOCALBASE}/sbin/mtree) MTREE?= ${LOCALBASE}/sbin/mtree diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk index 8fb5b87d726..1b05028daa8 100644 --- a/mk/defs.IRIX.mk +++ b/mk/defs.IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.IRIX.mk,v 1.20 2003/02/28 03:41:39 jschauma Exp $ +# $NetBSD: defs.IRIX.mk,v 1.21 2003/03/04 14:50:11 seb Exp $ # # Variable definitions for the IRIX operating system. @@ -42,6 +42,7 @@ HOSTNAME_CMD?= /usr/bsd/hostname ID?= /usr/bin/id LN?= /sbin/ln LS?= /sbin/ls +M4?= /usr/bin/m4 MKDIR?= /sbin/mkdir -p .if exists(${LOCALBASE}/sbin/mtree) MTREE?= ${LOCALBASE}/sbin/mtree diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index 3fc2906fd9c..ec752f8f9be 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.47 2003/02/28 03:41:39 jschauma Exp $ +# $NetBSD: defs.Linux.mk,v 1.48 2003/03/04 14:50:11 seb Exp $ # # Variable definitions for the Linux operating system. @@ -50,6 +50,7 @@ ID?= /usr/bin/id LDCONFIG?= /sbin/ldconfig LN?= /bin/ln LS?= /bin/ls +M4?= /usr/bin/m4 MKDIR?= /bin/mkdir -p MTREE?= ${ZOULARISBASE}/sbin/mtree MV?= /bin/mv diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index 441366071ea..737570a8e34 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.46 2003/02/28 03:41:39 jschauma Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.47 2003/03/04 14:50:11 seb Exp $ # # Variable definitions for the NetBSD operating system. @@ -38,6 +38,7 @@ ID?= /usr/bin/id LDCONFIG?= /sbin/ldconfig LN?= /bin/ln LS?= /bin/ls +M4?= /usr/bin/m4 MKDIR?= /bin/mkdir -p MTREE?= /usr/sbin/mtree MV?= /bin/mv diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk index c961fdbea5f..71cac395a61 100644 --- a/mk/defs.OpenBSD.mk +++ b/mk/defs.OpenBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.OpenBSD.mk,v 1.15 2003/02/28 03:41:39 jschauma Exp $ +# $NetBSD: defs.OpenBSD.mk,v 1.16 2003/03/04 14:50:11 seb Exp $ # # Variable definitions for the OpenBSD operating system. @@ -38,6 +38,7 @@ ID?= /usr/bin/id LDCONFIG?= /sbin/ldconfig LN?= /bin/ln LS?= /bin/ls +M4?= /usr/bin/m4 MKDIR?= /bin/mkdir -p MTREE?= /usr/sbin/mtree MV?= /bin/mv diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index efd5ce0a335..c4d1ba40935 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.56 2003/02/28 03:41:39 jschauma Exp $ +# $NetBSD: defs.SunOS.mk,v 1.57 2003/03/04 14:50:11 seb Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -46,6 +46,7 @@ IMAKE?= ${X11BASE}/bin/imake -DHasGcc2=YES -DHasGcc2ForCplusplus=YES LDCONFIG?= /usr/bin/true LN?= /usr/bin/ln LS?= /usr/bin/ls +M4?= /usr/bin/m4 MKDIR?= /usr/bin/mkdir -p .if exists(${LOCALBASE}/sbin/mtree) MTREE?= ${LOCALBASE}/sbin/mtree |