[pkgsrc/trunk]: pkgsrc/mk Adjust comment about SUBST_FILES to match reality:

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eff1eebf9230
branches:  trunk
changeset: 505655:eff1eebf9230
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 05 23:16:01 2006 +0000

description:
Adjust comment about SUBST_FILES to match reality:
absolute file names work as well.

diffstat:

 mk/bsd.pkg.mk           |  5 +++--
 mk/bulk/bsd.bulk-pkg.mk |  3 ++-
 mk/subst.mk             |  4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r e6504537cd45 -r eff1eebf9230 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Jan 05 23:14:35 2006 +0000
+++ b/mk/bsd.pkg.mk     Thu Jan 05 23:16:01 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1783 2006/01/04 04:25:47 schmonz Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1784 2006/01/05 23:16:01 joerg Exp $
 #
 # This file is in the public domain.
 #
@@ -391,7 +391,8 @@
 _TEST_COOKIE=          ${WRKDIR}/.test_done
 _INSTALL_COOKIE=       ${WRKDIR}/.install_done
 _PACKAGE_COOKIE=       ${WRKDIR}/.package_done
-_INTERACTIVE_COOKIE=   .interactive_stage
+_INTERACTIVE_COOKIE_DIR?=      ${.CURDIR}
+_INTERACTIVE_COOKIE=   ${_INTERACTIVE_COOKiE_DIR}/.interactive_stage
 _NULL_COOKIE=          ${WRKDIR}/.null
 
 # Miscellaneous overridable commands:
diff -r e6504537cd45 -r eff1eebf9230 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Thu Jan 05 23:14:35 2006 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Thu Jan 05 23:16:01 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.bulk-pkg.mk,v 1.108 2005/11/28 20:08:37 rillig Exp $
+#      $NetBSD: bsd.bulk-pkg.mk,v 1.109 2006/01/05 23:16:01 joerg Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -181,6 +181,7 @@
 
 # The directory where package-specific log files are saved.
 _BULK_PKGLOGDIR=       ${BULKFILESDIR}/${PKGPATH}
+_INTERACTIVE_COOKIE_DIR= ${BULK_PKGLOGDIR}
 
 # Package-specific log files.
 _BROKENFILE=           ${_BULK_PKGLOGDIR}/${BROKENFILE}
diff -r e6504537cd45 -r eff1eebf9230 mk/subst.mk
--- a/mk/subst.mk       Thu Jan 05 23:14:35 2006 +0000
+++ b/mk/subst.mk       Thu Jan 05 23:16:01 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.28 2006/01/01 22:52:16 rillig Exp $
+# $NetBSD: subst.mk,v 1.29 2006/01/05 23:16:01 joerg Exp $
 #
 # This Makefile fragment implements a general text replacement facility.
 # Package makefiles define a ``class'', for each of which a particular
@@ -19,7 +19,7 @@
 #
 # SUBST_FILES.<class>
 #      A list of file patterns on which to run the substitution;
-#      the filenames are relative to ${WRKSRC}.
+#      the filenames are either absolute or relative to ${WRKSRC}.
 #
 # SUBST_SED.<class>
 #      sed(1) substitution expression to run on the specified files.