diff options
| author | joerg <joerg@pkgsrc.org> | 2006-01-05 23:18:26 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-01-05 23:18:26 +0000 |
| commit | f8ae6026cd7820d44e8b576c9260a48e8ee9dcb8 (patch) | |
| tree | 6a9d1ddef273fdb464af3c7eddeb97d66eb460c8 /mk | |
| parent | c750987c1714e797bc8624b9847b227182fa4c54 (diff) | |
| download | pkgsrc-f8ae6026cd7820d44e8b576c9260a48e8ee9dcb8.tar.gz | |
Revert unintended part of last commit.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 5 | ||||
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d14f6d28e19..d5824eb209c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1784 2006/01/05 23:16:01 joerg Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1785 2006/01/05 23:18:26 joerg Exp $ # # This file is in the public domain. # @@ -391,8 +391,7 @@ _BUILD_COOKIE= ${WRKDIR}/.build_done _TEST_COOKIE= ${WRKDIR}/.test_done _INSTALL_COOKIE= ${WRKDIR}/.install_done _PACKAGE_COOKIE= ${WRKDIR}/.package_done -_INTERACTIVE_COOKIE_DIR?= ${.CURDIR} -_INTERACTIVE_COOKIE= ${_INTERACTIVE_COOKiE_DIR}/.interactive_stage +_INTERACTIVE_COOKIE= .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 03344e52fd8..3a8541263f5 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.109 2006/01/05 23:16:01 joerg Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.110 2006/01/05 23:18:27 joerg Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -181,7 +181,6 @@ _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} |