From a6daa45c47f553b9ff6a1120f48a322f4e834363 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 5 Mar 2019 09:33:59 +0100 Subject: autobuild: fix warnings due to cp command exit code Change-Id: Ie4bae20e33e05b5b166bec3fc4fadcce72ce09d3 Signed-off-by: Romain Forlot --- src/template.d/autobuild/agl/autobuild.in | 8 ++++++-- src/template.d/autobuild/linux/autobuild.in | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/template.d/autobuild/agl/autobuild.in b/src/template.d/autobuild/agl/autobuild.in index a832db4..db00c1a 100755 --- a/src/template.d/autobuild/agl/autobuild.in +++ b/src/template.d/autobuild/agl/autobuild.in @@ -59,7 +59,9 @@ package: build @mkdir -p ${BUILD_DIR}/$@/htdocs @mkdir -p ${BUILD_DIR}/$@/var @cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget - @mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST} + @if [ "${DEST}" != "${BUILD_DIR}" ]; then \ + mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \ + fi package-test: build @mkdir -p ${BUILD_DIR}/$@/bin @@ -69,7 +71,9 @@ package-test: build @mkdir -p ${BUILD_DIR}/$@/var @cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget @cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target test_widget - @mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST} + @if [ "${DEST}" != "${BUILD_DIR}" ]; then \ + mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \ + fi install: build @cmake --build ${BUILD_DIR} ${INSTALL_ARGS} --target install diff --git a/src/template.d/autobuild/linux/autobuild.in b/src/template.d/autobuild/linux/autobuild.in index a832db4..db00c1a 100755 --- a/src/template.d/autobuild/linux/autobuild.in +++ b/src/template.d/autobuild/linux/autobuild.in @@ -59,7 +59,9 @@ package: build @mkdir -p ${BUILD_DIR}/$@/htdocs @mkdir -p ${BUILD_DIR}/$@/var @cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget - @mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST} + @if [ "${DEST}" != "${BUILD_DIR}" ]; then \ + mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \ + fi package-test: build @mkdir -p ${BUILD_DIR}/$@/bin @@ -69,7 +71,9 @@ package-test: build @mkdir -p ${BUILD_DIR}/$@/var @cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget @cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target test_widget - @mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST} + @if [ "${DEST}" != "${BUILD_DIR}" ]; then \ + mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \ + fi install: build @cmake --build ${BUILD_DIR} ${INSTALL_ARGS} --target install -- cgit 1.2.3-korg