Commit ebaef43b authored by Franco Fichtner's avatar Franco Fichtner

make: honour spaces during plist/install stage

parent b1120c8e
...@@ -11,18 +11,18 @@ install${TARGET}: force ...@@ -11,18 +11,18 @@ install${TARGET}: force
mkdir -p ${DESTDIR}${ROOT${TARGET}}$${REALTARGET}; \ mkdir -p ${DESTDIR}${ROOT${TARGET}}$${REALTARGET}; \
cp -vr ${TREE} ${DESTDIR}${ROOT${TARGET}}$${REALTARGET} cp -vr ${TREE} ${DESTDIR}${ROOT${TARGET}}$${REALTARGET}
@(cd ${TREE}; find * -type f) | while read FILE; do \ @(cd ${TREE}; find * -type f) | while read FILE; do \
if [ $${FILE%%.in} != $${FILE} ]; then \ if [ "$${FILE%%.in}" != "$${FILE}" ]; then \
sed -i '' \ sed -i '' \
-e "s=%%CORE_PACKAGESITE%%=${CORE_PACKAGESITE}=g" \ -e "s=%%CORE_PACKAGESITE%%=${CORE_PACKAGESITE}=g" \
-e "s=%%CORE_REPOSITORY%%=${CORE_REPOSITORY}=g" \ -e "s=%%CORE_REPOSITORY%%=${CORE_REPOSITORY}=g" \
${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE}; \ "${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE}"; \
mv -v ${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE} \ mv -v "${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE}" \
${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE%%.in}; \ "${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE%%.in}"; \
fi; \ fi; \
FILE="$${FILE%%.in}"; \ FILE="$${FILE%%.in}"; \
if [ -n "${NO_SAMPLE}" -a $${FILE%%.sample} != $${FILE} ]; then \ if [ -n "${NO_SAMPLE}" -a "$${FILE%%.sample}" != "$${FILE}" ]; then \
mv -v ${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE} \ mv -v "${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE}" \
${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE%%.sample}; \ "${DESTDIR}${ROOT${TARGET}}/${TREE}/$${FILE%%.sample}"; \
fi; \ fi; \
done done
.endfor .endfor
...@@ -31,7 +31,7 @@ plist${TARGET}: force ...@@ -31,7 +31,7 @@ plist${TARGET}: force
.for TREE in ${TREES${TARGET}} .for TREE in ${TREES${TARGET}}
@(cd ${TREE}; find * -type f) | while read FILE; do \ @(cd ${TREE}; find * -type f) | while read FILE; do \
FILE="$${FILE%%.in}"; PREFIX=""; \ FILE="$${FILE%%.in}"; PREFIX=""; \
if [ -z "${NO_SAMPLE}" -a $${FILE%%.sample} != $${FILE} ]; then \ if [ -z "${NO_SAMPLE}" -a "$${FILE%%.sample}" != "$${FILE}" ]; then \
PREFIX="@sample "; \ PREFIX="@sample "; \
fi; \ fi; \
if [ -n "${NO_SAMPLE}" ]; then \ if [ -n "${NO_SAMPLE}" ]; then \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment