Fix make gx binary names on Windows

License: MIT Signed-off-by: Dominic Della Valle <ddvpublic@gmail.com>
ipfs · Feb 11, 2018 · 7533699 · 7533699
1 parent a0f65fd
commit 7533699
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/bin/Rules.mk b/bin/Rules.mk
@@ -1,6 +1,10 @@
 include mk/header.mk
 
 dist_root_$(d)=/ipfs/QmT3CLJKJzWPuN4NAN4LLy69UpKskMF3AuYhXstKdn8V43
+binpostfix :=
+ifeq ($(OS),Windows_NT)
+binpostfix = .exe
+endif
 
 $(d)/gx: $(d)/gx-v0.12.1
 $(d)/gx-go: $(d)/gx-go-v1.6.0
@@ -11,8 +15,8 @@ DISTCLEAN += $(wildcard $(d)/gx-v*) $(wildcard $(d)/gx-go-v*) $(d)/tmp
 PATH := $(realpath $(d)):$(PATH)
 
 $(TGTS_$(d)):
-	rm -f $@
-	ln -s $(notdir $^) $@
+	rm -f $@$(binpostfix)
+	ln -s $(notdir $^)$(binpostfix) $@$(binpostfix)
 
 bin/gx-v%:
 	@echo "installing gx $(@:bin/gx-%=%)"

diff --git a/mk/gx.mk b/mk/gx.mk
@@ -1,7 +1,11 @@
-gx-path = gx/ipfs/$(shell gx deps find $(1))/$(1)
+binpostfix :=
+ifeq ($(OS),Windows_NT)
+binpostfix = .exe
+endif
+gx-path = gx/ipfs/$(shell gx$(binpostfix) deps find $(1))/$(1)
 
 gx-deps:
-	gx install --global
+	gx$(binpostfix) install --global
 .PHONY: gx-deps
 
 ifneq ($(IPFS_GX_USE_GLOBAL),1)