diff options
| author | jlam <jlam> | 2005-11-04 20:36:42 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-11-04 20:36:42 +0000 |
| commit | f5cd359d3a032d88668a9cf07d7308a498abb118 (patch) | |
| tree | 8e935e9448ab936aa0677288289fa62109f19659 /mk/bsd.pkg.mk | |
| parent | 7ca19ef5be944571c0b79d74eba8dd8f9c569230 (diff) | |
| download | pkgsrc-f5cd359d3a032d88668a9cf07d7308a498abb118.tar.gz | |
Relax rules a bit on INSTALLATION_DIRS -- we still enforce that
directories listed in INSTALLATION_DIRS are created in ${PREFIX}, but
it's now okay to include ${PREFIX} at the front of each, directory,
e.g. this is now okay:
INSTALLATION_DIRS+= ${PREFIX}/bin
Makes using this variable a bit less unwieldy sometimes.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 33a4059a680..0b577aacafc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1741 2005/11/04 20:28:47 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1742 2005/11/04 20:36:42 jlam Exp $ # # This file is in the public domain. # @@ -2099,7 +2099,10 @@ real-su-install: ${MESSAGE} ${_PKG_SILENT}${_PKG_DEBUG} \ for dir in ${INSTALLATION_DIRS}; do \ case $$dir in \ - /*) ;; \ + ${PREFIX}/*) ;; \ + *) continue ;; \ + done; \ + case $$dir in \ *bin|*bin/*|*libexec|*libexec/*) \ ${INSTALL_PROGRAM_DIR} ${PREFIX}/$$dir ;; \ ${PKGMANDIR}/*) \ |