From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Wed, 25 Jul 2018 16:26:38 +0000 (+0200)
Subject: Ignored webapp/install error when DESTDIR doesn't exist
X-Git-Tag: 5.99.3^0
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-server.git;a=commitdiff_plain;h=bb34a059939273ef71fa067feff357a6278820e2

Ignored webapp/install error when DESTDIR doesn't exist

Change-Id: I80e79fc350a1905cb3c4a98ef0a7cf0659a18c88
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
---

diff --git a/Makefile b/Makefile
index 99fbb55..705b670 100644
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,7 @@ webapp: webapp/install
 
 webapp/install:
 	(cd webapp && npm install)
-	@[ -d ${DESTDIR}/usr ] && { echo "Removing unwanted ${DESTDIR}/usr directory"; rm -rf ${DESTDIR}/usr; }
+	@[ -d ${DESTDIR}/usr ] && { echo "Removing unwanted ${DESTDIR}/usr directory"; rm -rf ${DESTDIR}/usr; } || true
 
 .PHONY: scripts
 scripts: