pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/doc/guide Work around some issues that older makes (li...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/01a55c10013b
branches:  trunk
changeset: 533974:01a55c10013b
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Wed Oct 10 05:45:47 2007 +0000

description:
Work around some issues that older makes (like in netbsd-2) have with
being called recursively with MAKECONF=/dev/null.  Now the guide can
be built on netbsd-2

diffstat:

 doc/guide/Makefile |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r d83bbfd5d1c0 -r 01a55c10013b doc/guide/Makefile
--- a/doc/guide/Makefile        Wed Oct 10 05:30:29 2007 +0000
+++ b/doc/guide/Makefile        Wed Oct 10 05:45:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/07/02 19:00:01 tnn Exp $
+# $NetBSD: Makefile,v 1.30 2007/10/10 05:45:47 dmcmahill Exp $
 #
 
 DISTNAME=              pkgsrc-guide-${PKGVERSION}
@@ -40,14 +40,21 @@
 
 .include "Makefile.common"
 
+# this hack is needed because otherwise PKGMAKECONF ends up set
+# to /dev/null during the build.  When make is then called recursively
+# with MAKECONF=/dev/null, some older versions fail.
+PKGMAKECONF?=  ${WRKDIR}/mk.conf
+
 # The source files are only symlinked into the WRKSRC, so that they can
 # be easily modified, should the "lint" phase fail.
 pre-extract:
        ${MKDIR} ${WRKSRC}
        ${LN} -s ${FILESDIR}/* ${WRKSRC}
+       ${TOUCH} ${PKGMAKECONF}
 
 do-build:
 .for _output_ in ${OUTPUTS}
+       @${ECHO} "-----> Building ${_output_} output"
        @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${_output_}
 .endfor
 



Home | Main Index | Thread Index | Old Index