From b7bc9102de461eb880d951f16bdd9ded74e43a4f Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Wed, 18 Jul 2018 11:30:16 +0200 Subject: [PATCH] Fixed error about unwanted usr directory Change-Id: I8404ee2dd1eff5c20924e841c0a37ea16c85cc17 Signed-off-by: Sebastien Douheret --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 07357f3..99fbb55 100644 --- a/Makefile +++ b/Makefile @@ -149,7 +149,7 @@ webapp: webapp/install webapp/install: (cd webapp && npm install) - @if [ -d ${DESTDIR}/usr ]; then rmdir ${DESTDIR}/usr; fi + @[ -d ${DESTDIR}/usr ] && { echo "Removing unwanted ${DESTDIR}/usr directory"; rm -rf ${DESTDIR}/usr; } .PHONY: scripts scripts: @@ -163,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) \ -- 2.16.6