Change-Id: I8404ee2dd1eff5c20924e841c0a37ea16c85cc17
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
webapp/install:
(cd webapp && npm 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; }
- @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) \
mkdir -p $(DESTDIR) \
&& cp -a $(LOCAL_BINDIR)/* $(DESTDIR)
mkdir -p $(DESTDIR_WWW) \