test: actually use downloaded gx binary, clean up obsolete variable
License: MIT Signed-off-by: Lars Gierth <larsg@systemli.org>
Lars Gierth committed
Jul 8, 2016 at 21:36 UTC
816ab825b1451fe0c05fb7632b5ea9e81240df1d
1 file changed
+4
-6
test/Makefile
+4
-6
@@ -7,8 +7,6 @@ RANDOM_FILES_SRC = ../Godeps/_workspace/src/github.com/jbenet/go-random-files
7
POLLENDPOINT_SRC= ../thirdparty/pollEndpoint
8
GOSLEEP_SRC = ./dependencies/go-sleep
9
10
-GX_RELATIVE_PATH = gx/ipfs
11
-
10
export PATH := ../bin:${PATH}
11
12
# User might want to override those on the command line
@@ -53,16 +51,16 @@ bin/go-sleep: $(call find_go_files, $(GOSLEEP_SRC)) IPFS-BUILD-OPTIONS
51
# gx dependencies
52
53
multihash_src:
56
- $(eval MULTIHASH_HASH := $(shell cd .. && gx deps find go-multihash))
57
- $(eval MULTIHASH_SRC := $(GX_RELATIVE_PATH)/$(MULTIHASH_HASH)/go-multihash)
54
+ $(eval MULTIHASH_HASH := $(shell cd .. && bin/gx deps find go-multihash))
55
+ $(eval MULTIHASH_SRC := gx/ipfs/$(MULTIHASH_HASH)/go-multihash)
56
57
bin/multihash: multihash_src $(call find_go_files, $(MULTIHASH_SRC)) IPFS-BUILD-OPTIONS
58
@echo "*** installing $@ ***"
59
go build $(GOFLAGS) -o bin/multihash $(MULTIHASH_SRC)/multihash
60
61
iptb_src:
64
- $(eval IPTB_HASH := $(shell cd .. && gx deps find iptb))
65
- $(eval IPTB_SRC := $(GX_RELATIVE_PATH)/$(IPTB_HASH)/iptb)
62
+ $(eval IPTB_HASH := $(shell cd .. && bin/gx deps find iptb))
63
+ $(eval IPTB_SRC := gx/ipfs/$(IPTB_HASH)/iptb)
64
65
bin/iptb: iptb_src $(call find_go_files, $(IPTB_SRC)) IPFS-BUILD-OPTIONS
66
@echo "*** installing $@ ***"