Fix for Makefile.{local,inc,${ARCH},${OPSYS},${ARCH}-${OPSYS}} [patch]

[Maxim Sobolev]

OOPS, attaching it now.

-Maxim

On Thu, May 01, 2003 at 02:10:11PM +0300, Ruslan Ermilov wrote:
> On Thu, May 01, 2003 at 01:25:44PM +0300, Maxim Sobolev wrote:
> > Folks,
> > 
> > Attched please find a patch, which fixes auto-inclusion of various
> > Makefile.*, broken since my bsd.port.mk speed-up changes.
> > 
> > Please review/approve or put on test on bento if you think that it
> > is necessary.
> > 
> I looked to no avail, but couldn't find the attachment.  ;)
> 
> 
> Cheers,
> -- 
> Ruslan Ermilov		Sysadmin and DBA,
> ru at sunbay.com		Sunbay Software AG,
> ru at FreeBSD.org		FreeBSD committer,
> +380.652.512.251	Simferopol, Ukraine
> 
> http://www.FreeBSD.org	The Power To Serve
> http://www.oracle.com	Enabling The Information Age


-------------- next part --------------
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.447
diff -d -u -r1.447 bsd.port.mk
--- bsd.port.mk	19 Apr 2003 22:35:28 -0000	1.447
+++ bsd.port.mk	1 May 2003 10:20:55 -0000
@@ -813,22 +813,28 @@
 
 .if ${MASTERDIR} != ${.CURDIR} && exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
+USE_SUBMAKE=	yes
 .endif
 
 .if exists(${MASTERDIR}/../Makefile.inc)
 .include "${MASTERDIR}/../Makefile.inc"
+USE_SUBMAKE=	yes
 .endif
 
 .if exists(${MASTERDIR}/Makefile.${ARCH}-${OPSYS})
 .include "${MASTERDIR}/Makefile.${ARCH}-${OPSYS}"
+USE_SUBMAKE=	yes
 .elif exists(${MASTERDIR}/Makefile.${OPSYS})
 .include "${MASTERDIR}/Makefile.${OPSYS}"
+USE_SUBMAKE=	yes
 .elif exists(${MASTERDIR}/Makefile.${ARCH})
 .include "${MASTERDIR}/Makefile.${ARCH}"
+USE_SUBMAKE=	yes
 .endif
 
 .if exists(${MASTERDIR}/Makefile.local)
 .include "${MASTERDIR}/Makefile.local"
+USE_SUBMAKE=	yes
 .endif
 
 .if !defined(PORTNAME) || !defined(PORTVERSION) || defined(PKGNAME)
@@ -1394,6 +1400,7 @@
 
 .if exists(${PORTSDIR}/../Makefile.inc)
 .include "${PORTSDIR}/../Makefile.inc"
+USE_SUBMAKE=	yes
 .endif
 
 # Special macro for doing in-place file editing using regexps