Tue Aug 8 17:17:25 2017 UTC ()

Check, don't assert, that INSTALLATION_DIRS are all in ${PREFIX}.

Change the assertion into an install-time check that the paths
listed in INSTALLATION_DIRS are relative paths or are in ${PREFIX}.
This delays the check so that some common variables used when
listing directories in INSTALLATION_DIRS are fully-expanded.


(jlam)

diff -r1.71 -r1.72 pkgsrc/mk/install/install.mk

--- pkgsrc/mk/install/install.mk 2017/08/07 15:49:44 1.71
+++ pkgsrc/mk/install/install.mk 2017/08/08 17:17:25 1.72

 @@ -1,14 +1,14 @@
-# $NetBSD: install.mk,v 1.71 2017/08/07 15:49:44 jlam Exp $
+# $NetBSD: install.mk,v 1.72 2017/08/08 17:17:25 jlam Exp $
+#
 # This file provides the code for the "install" phase.
+#
 # Public targets:
+#
 # stage-install:
 #	Installs the package files into LOCALBASE or ${DESTDIR}${LOCALBASE}.
+#
 # Interface for other infrastructure components:
+#
 # Hooks for use by the infrastructure:
+#
 @@ -236,41 +236,45 @@ _INSTALL_ONE_DIR_CMD= { \
 	*)								\
 		${INSTALL_DATA_DIR} "$$ddir" ;;				\
 	esac;								\
+	}
 # _INSTALLATION_DIRS
 #	Contains the items listed in ${INSTALLATION_DIRS} with the
 #	following transformations performed, in order:
+#
 #	1. Leading "${PREFIX}/" is stripped.
 #	2. Leading "gnu/" is transformed into "${PKGGNUDIR}".
 #	3. Leading "man/" is transformed into "${PKGMANDIR}/".
+#
-# ASSERT: Paths listed in ${_INSTALLATION_DIRS} must be relative paths.
+# Check that paths listed in ${_INSTALLATION_DIRS} are relative paths.
 # This can't be an assertion because some variables used when listing
 # directories in INSTALLATION_DIRS are not expanded until they are
 # used.
+#
 _INSTALLATION_DIRS=	${INSTALLATION_DIRS:C,^${PREFIX}/,,:C,^gnu/,${PKGGNUDIR},:C,^man/,${PKGMANDIR}/,}
 .if !empty(_INSTALLATION_DIRS:M/*)
 PKG_FAIL_REASON+=	"INSTALLATION_DIRS items must begin with "${PREFIX:Q}" or be relative paths."
 .endif
 .PHONY: install-makedirs
 install-makedirs:
 	${RUN} ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}
 .if defined(INSTALLATION_DIRS) && !empty(INSTALLATION_DIRS)
 	@${STEP_MSG} "Creating installation directories"
-	${RUN}								\
+	${RUN} set -- args ${_INSTALLATION_DIRS}; shift;		\
-	for dir in ${_INSTALLATION_DIRS}; do				\
+	while ${TEST} "$$#" -gt 0; do					\
-		${_INSTALL_ONE_DIR_CMD};				\
+		dir="$$1"; shift;					\
 		case "$$dir" in						\
 		/*)	${FAIL_MSG} "INSTALLATION_DIRS: $$dir must be in "${PREFIX:Q}"." ;; \
 		*)	${_INSTALL_ONE_DIR_CMD}	;;			\
 		esac;							\
 	done
 .endif	# INSTALLATION_DIRS
 # Creates the directories for all files that are mentioned in the static
 # PLIST files of the package, to make the declaration of
 # INSTALLATION_DIRS redundant in some cases.
+#
 # To enable this, the variable INSTALLATION_DIRS_FROM_PLIST must be set
 # to "yes".
+#
 .PHONY: install-dirs-from-PLIST
 install-dirs-from-PLIST:
 	@${STEP_MSG} "Creating installation directories from PLIST files"