From 3a47f5851163e6e2e0e094d6b6900ac5f8d56f56 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 17 Mar 2006 08:02:41 +0000 Subject: Allow INSTALLATION_DIRS to contain absolute paths so long as they being with ${PREFIX}. This simplifies re-using variables that contain full paths. --- mk/bsd.pkg.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e83ceb24249..0ef54ea0199 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1810 2006/03/15 16:20:11 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1811 2006/03/17 08:02:41 jlam Exp $ # # This file is in the public domain. # @@ -1913,7 +1913,11 @@ real-su-install: ${MESSAGE} ${_PKG_SILENT}${_PKG_DEBUG} \ for dir in ${INSTALLATION_DIRS}; do \ case $$dir in \ - /*) ;; \ + ${PREFIX}/*) \ + dir=`${ECHO} $$dir | ${SED} "s|^${PREFIX}/||"` ;; \ + /*) continue ;; \ + esac; \ + case $$dir in \ *bin|*bin/*|*libexec|*libexec/*) \ ${INSTALL_PROGRAM_DIR} ${PREFIX}/$$dir ;; \ ${PKGMANDIR}/*) \ -- cgit v1.2.3