From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Fri, 6 Jul 2018 11:22:26 +0000 (+0200)
Subject: Removed unwanted usr directory from package
X-Git-Tag: 5.99.2~5
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-server.git;a=commitdiff_plain;h=dbfc002f609befedc705906750c85faf4a3ac7dc

Removed unwanted usr directory from package

Don't know exactly which tool create this directory (I suspect
npm install process) but 'usr' directory should not be part of XDS
zip package.

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

diff --git a/Makefile b/Makefile
index d4f86b2..07357f3 100644
--- a/Makefile
+++ b/Makefile
@@ -149,6 +149,7 @@ webapp: webapp/install
 
 webapp/install:
 	(cd webapp && npm install)
+	@if [ -d ${DESTDIR}/usr ]; then rmdir ${DESTDIR}/usr; fi
 
 .PHONY: scripts
 scripts: