Merge branch 'develop' of https://github.com/WeMeetAgain/go-ethereum into WeMeetAgain-develop

Conflicts:
	ethereal/Makefile
This commit is contained in:
obscuren 2014-03-22 11:32:01 +01:00
commit fe79a8f724

@ -1,19 +1,20 @@
UNAME = $(shell uname) UNAME = $(shell uname)
FILES=qml *.png
GOPATH=$(PWD)
# Default is building # Default is building
all: 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: install:
# Linux build # Linux build
ifeq ($(UNAME),Linux) ifeq ($(UNAME),Linux)
mkdir -p /usr/local/ethereal cp -r assets/* /usr/share/ethereal
files=(net.png network.png new.png tx.png) cp go-ethereum /usr/local/bin/ethereal
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
endif endif
# OS X build # OS X build
ifeq ($(UNAME),Darwin) ifeq ($(UNAME),Darwin)