diff options
| author | obscuren <geffobscura@gmail.com> | 2014-03-22 18:32:01 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-03-22 18:32:01 +0800 |
| commit | fe79a8f72466a8abff45de8dafc138389ddaea90 (patch) | |
| tree | d256208a81b36dce11e7f81ab9427fc7b01f6260 | |
| parent | 1f2547b8a7cfe100f64428d20f4bcf95eb9ecc5c (diff) | |
| parent | 13e18e1d8f717ffab1b59a39cf67ef169a542e74 (diff) | |
| download | dexon-fe79a8f72466a8abff45de8dafc138389ddaea90.tar.gz dexon-fe79a8f72466a8abff45de8dafc138389ddaea90.tar.zst dexon-fe79a8f72466a8abff45de8dafc138389ddaea90.zip | |
Merge branch 'develop' of https://github.com/WeMeetAgain/go-ethereum into WeMeetAgain-develop
Conflicts:
ethereal/Makefile
| -rw-r--r-- | ethereal/Makefile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ethereal/Makefile b/ethereal/Makefile index 02d127963..1acf03049 100644 --- a/ethereal/Makefile +++ b/ethereal/Makefile @@ -1,19 +1,20 @@ UNAME = $(shell uname) +FILES=qml *.png +GOPATH=$(PWD) + # Default is building all: - go install + go get -d + cp *.go $(GOPATH)/src/github.com/ethereum/go-ethereum + cp -r ui $(GOPATH)/src/github.com/ethereum/go-ethereum + go build install: # Linux build ifeq ($(UNAME),Linux) - mkdir -p /usr/local/ethereal - files=(net.png network.png new.png tx.png) - for file in "${files[@]}"; do - cp $file /usr/share/ethereal - done - cp -r qml /usr/share/ethereal/qml - cp $GOPATH/bin/go-ethereum /usr/local/bin/ethereal + cp -r assets/* /usr/share/ethereal + cp go-ethereum /usr/local/bin/ethereal endif # OS X build ifeq ($(UNAME),Darwin) |