From ebaef43b603f6755bdceac4fb53dcfb8dcf0710d Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 27 Jan 2016 09:44:24 +0100
Subject: [PATCH] make: honour spaces during plist/install stage

---
 Mk/tree.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Mk/tree.mk b/Mk/tree.mk
index d1a4672ad..79e5b9814 100644
--- a/Mk/tree.mk
+++ b/Mk/tree.mk
@@ -11,18 +11,18 @@ install${TARGET}: force
 	mkdir -p ${DESTDIR}${ROOT${TARGET}}$${REALTARGET}; \
 	cp -vr ${TREE} ${DESTDIR}${ROOT${TARGET}}$${REALTARGET}
 	@(cd ${TREE}; find * -type f) | while read FILE; do \
-		if [ $${FILE%%.in} != $${FILE} ]; then \
+		if [ "$${FILE%%.in}" != "$${FILE}" ]; then \
 			sed -i '' \
 			    -e "s=%%CORE_PACKAGESITE%%=${CORE_PACKAGESITE}=g" \
 			    -e "s=%%CORE_REPOSITORY%%=${CORE_REPOSITORY}=g" \
-			    ${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE}; \
-			mv -v ${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE} \
-			    ${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE%%.in}; \
+			    "${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE}"; \
+			mv -v "${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE}" \
+			    "${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE%%.in}"; \
 		fi; \
 		FILE="$${FILE%%.in}"; \
-		if [ -n "${NO_SAMPLE}" -a $${FILE%%.sample} != $${FILE} ]; then \
-			mv -v ${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE} \
-			    ${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE%%.sample}; \
+		if [ -n "${NO_SAMPLE}" -a "$${FILE%%.sample}" != "$${FILE}" ]; then \
+			mv -v "${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE}" \
+			    "${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE%%.sample}"; \
 		fi; \
 	done
 .endfor
@@ -31,7 +31,7 @@ plist${TARGET}: force
 .for TREE in ${TREES${TARGET}}
 	@(cd ${TREE}; find * -type f) | while read FILE; do \
 		FILE="$${FILE%%.in}"; PREFIX=""; \
-		if [ -z "${NO_SAMPLE}" -a $${FILE%%.sample} != $${FILE} ]; then \
+		if [ -z "${NO_SAMPLE}" -a "$${FILE%%.sample}" != "$${FILE}" ]; then \
 			PREFIX="@sample "; \
 		fi; \
 		if [ -n "${NO_SAMPLE}" ]; then \