Fix Syncthing package retrieval for Windows

[src/xds/xds-agent.git] / Makefile

diff --git a/Makefile b/Makefile
index 619c514..160b91a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-       rm -rf $(LOCAL_BINDIR) tools glide.lock vendor
+       rm -rf $(LOCAL_BINDIR) tools glide.lock vendor $(ROOT_SRCDIR)/*.zip
 
 .PHONY: install
 install: all
@@ -96,7 +96,7 @@ tools/glide:
 
 .PHONY: tools/syncthing
 tools/syncthing:
-       @test -e $(LOCAL_TOOLSDIR)/syncthing -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify  || { \
+       @test -e $(LOCAL_TOOLSDIR)/syncthing$(EXT) -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT)  || { \
        mkdir -p $(LOCAL_TOOLSDIR); \
        DESTDIR=$(LOCAL_TOOLSDIR) \
        SYNCTHING_VERSION=$(SYNCTHING_VERSION) \
@@ -105,7 +105,7 @@ tools/syncthing:
 
 .PHONY:
 tools/syncthing/copytobin:
-       @test -e $(LOCAL_TOOLSDIR)/syncthing -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify || { echo "Please execute first: make tools/syncthing\n"; exit 1; }
+       @test -e $(LOCAL_TOOLSDIR)/syncthing$(EXT) -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make tools/syncthing\n"; exit 1; }
        @mkdir -p $(LOCAL_BINDIR)
        @cp -f $(LOCAL_TOOLSDIR)/syncthing$(EXT) $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) $(LOCAL_BINDIR)