Code Review
/
src
/
xds
/
xds-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c53aef7
)
Fix Makefile install commands
author
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Fri, 19 May 2017 14:52:37 +0000
(16:52 +0200)
committer
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Fri, 19 May 2017 14:52:37 +0000
(16:52 +0200)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
3bcf34e
..
96bada4
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-95,7
+95,7
@@
install:
@test -e $(LOCAL_BINDIR)/xds-start-server.sh -a -d $(LOCAL_BINDIR)/agl || { echo "Please execute first: make all\n"; exit 1; }
@test -e $(LOCAL_BINDIR)/syncthing -a -e $(LOCAL_BINDIR)/syncthing-inotify || { echo "Please execute first: make all\n"; exit 1; }
mkdir -p $(INSTALL_DIR) \
@test -e $(LOCAL_BINDIR)/xds-start-server.sh -a -d $(LOCAL_BINDIR)/agl || { echo "Please execute first: make all\n"; exit 1; }
@test -e $(LOCAL_BINDIR)/syncthing -a -e $(LOCAL_BINDIR)/syncthing-inotify || { echo "Please execute first: make all\n"; exit 1; }
mkdir -p $(INSTALL_DIR) \
- && cp -a $(LOCAL_BINDIR)/* $(INSTALL_DIR)
\
+ && cp -a $(LOCAL_BINDIR)/* $(INSTALL_DIR)
mkdir -p $(INSTALL_WEBAPP_DIR) \
&& cp -a webapp/dist/* $(INSTALL_WEBAPP_DIR)
mkdir -p $(INSTALL_WEBAPP_DIR) \
&& cp -a webapp/dist/* $(INSTALL_WEBAPP_DIR)
@@
-110,6
+110,7
@@
tools/glide:
.PHONY: tools/syncthing
tools/syncthing:
@test -e $(LOCAL_TOOLSDIR)/syncthing -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify || { \
.PHONY: tools/syncthing
tools/syncthing:
@test -e $(LOCAL_TOOLSDIR)/syncthing -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify || { \
+ mkdir -p $(LOCAL_TOOLSDIR); \
DESTDIR=$(LOCAL_TOOLSDIR) \
SYNCTHING_VERSION=$(SYNCTHING_VERSION) \
SYNCTHING_INOTIFY_VERSION=$(SYNCTHING_INOTIFY_VERSION) \
DESTDIR=$(LOCAL_TOOLSDIR) \
SYNCTHING_VERSION=$(SYNCTHING_VERSION) \
SYNCTHING_INOTIFY_VERSION=$(SYNCTHING_INOTIFY_VERSION) \