aboutsummaryrefslogtreecommitdiff
path: root/weed-fs/src/pkg/util
diff options
context:
space:
mode:
authorchris.lu@gmail.com <chris.lu@gmail.com@282b0af5-e82d-9cf1-ede4-77906d7719d0>2012-01-18 22:59:33 +0000
committerchris.lu@gmail.com <chris.lu@gmail.com@282b0af5-e82d-9cf1-ede4-77906d7719d0>2012-01-18 22:59:33 +0000
commit380953692b5faa97ccd3caa62b9f5ed6e528f672 (patch)
treee0c311e64d8cb7a3bf42f5d59e683f53bf433fe0 /weed-fs/src/pkg/util
parent50b1eff39025d09fb2a3017f11cb944c86282334 (diff)
downloadseaweedfs-380953692b5faa97ccd3caa62b9f5ed6e528f672.tar.xz
seaweedfs-380953692b5faa97ccd3caa62b9f5ed6e528f672.zip
generating makefiles from a newer version of gb
git-svn-id: https://weed-fs.googlecode.com/svn/trunk@41 282b0af5-e82d-9cf1-ede4-77906d7719d0
Diffstat (limited to 'weed-fs/src/pkg/util')
-rw-r--r--weed-fs/src/pkg/util/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/weed-fs/src/pkg/util/Makefile b/weed-fs/src/pkg/util/Makefile
index bf3a57f05..458e05408 100644
--- a/weed-fs/src/pkg/util/Makefile
+++ b/weed-fs/src/pkg/util/Makefile
@@ -14,13 +14,14 @@ GBROOT=../../..
# gb: compile/link against local install
GCIMPORTS+= -I $(GBROOT)/_obj
LDIMPORTS+= -L $(GBROOT)/_obj
+
# gb: compile/link against GOPATH entries
GOPATHSEP=:
ifeq ($(GOHOSTOS),windows)
GOPATHSEP=;
endif
-GCIMPORTS=-I $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -I , $(GOPATH))/pkg/$(GOOS)_$(GOARCH)
-LDIMPORTS=-L $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -L , $(GOPATH))/pkg/$(GOOS)_$(GOARCH)
+GCIMPORTS+=-I $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -I , $(GOPATH))/pkg/$(GOOS)_$(GOARCH)
+LDIMPORTS+=-L $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -L , $(GOPATH))/pkg/$(GOOS)_$(GOARCH)
# gb: copy to local install
$(GBROOT)/_obj/$(TARG).a: _obj/$(TARG).a