diff options
| author |   Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-07-18 11:30:16 +0200 |
|---|---|---|
| committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-07-18 18:05:32 +0200 |
| commit | b7bc9102de461eb880d951f16bdd9ded74e43a4f (patch) | |
| tree | e875cf4d98c49eff5c7109e9a0297941b87f65e1 | |
| parent | b4ea2f3048518455b80262c16ebaa80d3cc7bba6 (diff) | |
Fixed error about unwanted usr directorysandbox/SebD
Change-Id: I8404ee2dd1eff5c20924e841c0a37ea16c85cc17
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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) \ |