X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=705b670a9c7ebe1fb50e8effb606a74074440bcf;hb=bb34a059939273ef71fa067feff357a6278820e2;hp=d4f86b297b43e6c483f881a01949d4f2eb924a78;hpb=f870de867b43bfb1220067f81c11395438fb2863;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index d4f86b2..705b670 100644
--- a/Makefile
+++ b/Makefile
@@ -149,6 +149,7 @@ webapp: webapp/install
 
 webapp/install:
 	(cd webapp && npm install)
+	@[ -d ${DESTDIR}/usr ] && { echo "Removing unwanted ${DESTDIR}/usr directory"; rm -rf ${DESTDIR}/usr; } || true
 
 .PHONY: scripts
 scripts:
@@ -162,9 +163,9 @@ conffile:
 
 .PHONY: install
 install:
-	@test -e $(LOCAL_BINDIR)/xds-server$(EXT) -a -d webapp/dist || { echo "Please execute first: make all\n"; exit 1; }
-	@test -d $(LOCAL_BINDIR)/xds-utils || { echo "Please execute first: make all\n"; exit 1; }
-	@test -e $(LOCAL_BINDIR)/syncthing$(EXT) -a -e $(LOCAL_BINDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make all\n"; exit 1; }
+	@test -e $(LOCAL_BINDIR)/xds-server$(EXT) -a -d webapp/dist || { echo "Please execute first: make all"; exit 1; }
+	@test -d $(LOCAL_BINDIR)/xds-utils || { echo "Please execute first: make all"; exit 1; }
+	@test -e $(LOCAL_BINDIR)/syncthing$(EXT) -a -e $(LOCAL_BINDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make all"; exit 1; }
 	mkdir -p $(DESTDIR) \
 		&& cp -a $(LOCAL_BINDIR)/* $(DESTDIR)
 	mkdir -p $(DESTDIR_WWW) \