diff options
| author | joerg <joerg@pkgsrc.org> | 2006-01-05 23:16:01 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-01-05 23:16:01 +0000 |
| commit | 42805bbf0fdbfb14121021201e6bc66d98417465 (patch) | |
| tree | e3c5858ad55f03393771b495427a257d116236f8 /mk | |
| parent | 9ec1989a0fd9b3449523999441e31ed76e3d3310 (diff) | |
| download | pkgsrc-42805bbf0fdbfb14121021201e6bc66d98417465.tar.gz | |
Adjust comment about SUBST_FILES to match reality:
absolute file names work as well.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 5 | ||||
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 3 | ||||
| -rw-r--r-- | mk/subst.mk | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 11243d2c215..d14f6d28e19 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ _BUILD_COOKIE= ${WRKDIR}/.build_done _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 --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index ef48da94c3a..03344e52fd8 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -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> @@ -181,6 +181,7 @@ _ESCPKGPATH= ${PKGPATH:C@\/@\\/@g:C@\+@\\+@g:C@\.@\\.@g:Q} # 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 --git a/mk/subst.mk b/mk/subst.mk index 73987758f74..3a2eaca7638 100644 --- a/mk/subst.mk +++ b/mk/subst.mk @@ -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. |