Skip to content

Commit

Permalink
Use .build instead of build so that go test works properly.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kelly Norton committed Apr 14, 2015
1 parent 9a4bbcd commit 4c41b39
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.vagrant
build
.build
config.json
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

ALL: ui/bindata.go

build/bin/go-bindata:
GOPATH=`pwd`/build go get github.com/jteeuwen/go-bindata/...
.build/bin/go-bindata:
GOPATH=`pwd`/.build go get github.com/jteeuwen/go-bindata/...

ui/bindata.go: build/bin/go-bindata $(wildcard ui/assets/**/*)
rsync -r --exclude '*.js' ui/assets/* build/ui
jsx --no-cache-dir ui/assets/js build/ui/js
$< -o $@ -pkg ui -prefix build/ui -nomemcopy build/ui/...
ui/bindata.go: .build/bin/go-bindata $(wildcard ui/assets/**/*)
rsync -r --exclude '*.js' ui/assets/* .build/ui
jsx --no-cache-dir ui/assets/js .build/ui/js
$< -o $@ -pkg ui -prefix .build/ui -nomemcopy .build/ui/...

clean:
rm -rf build
rm -rf .build

0 comments on commit 4c41b39

Please sign in to comment.