pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Set GMAKE to /usr/bin/make only of that actually ex...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0227ebf147cf
branches:  trunk
changeset: 460171:0227ebf147cf
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Sat Aug 23 16:04:26 2003 +0000

description:
Set GMAKE to /usr/bin/make only of that actually exists, else set it
to ${LOCALBASE}/bin/gmake.  Patch by Soren Jacobsen in PR pkg/22506.
(Not closing that PR, as we should determine a procedure to bootstrap
on a system without any make.)

diffstat:

 mk/defs.Linux.mk |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r c55375b16217 -r 0227ebf147cf mk/defs.Linux.mk
--- a/mk/defs.Linux.mk  Sat Aug 23 15:27:00 2003 +0000
+++ b/mk/defs.Linux.mk  Sat Aug 23 16:04:26 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.53 2003/06/06 19:07:42 jschauma Exp $
+# $NetBSD: defs.Linux.mk,v 1.54 2003/08/23 16:04:26 jschauma Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -37,7 +37,13 @@
 .endif
 FILE_CMD?=     /usr/bin/file
 FIND?=         /usr/bin/find
+.if exists(/usr/bin/make)
 GMAKE?=                /usr/bin/make
+_OPSYS_HAS_GMAKE=      yes             # GNU make is standard
+.else
+GMAKE?=                ${LOCALBASE}/bin/gmake
+_OPSYS_HAS_GMAKE=      no              # rare, but possible
+.endif
 .if exists(/bin/grep)
 GREP?=         /bin/grep
 .elif exists(/usr/bin/grep)
@@ -148,7 +154,6 @@
 
 _DO_SHLIB_CHECKS=      no      # on installation, fixup PLIST for shared libs
 _IMAKE_MAKE=           ${MAKE} # program which gets invoked by imake
-_OPSYS_HAS_GMAKE=      yes     # GNU make is standard
 .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
 _OPSYS_HAS_INET6=      yes     # IPv6 is standard
 .else



Home | Main Index | Thread Index | Old Index