diff -r cf1a9b1f9bee src/Make.pkg
--- a/src/Make.pkg      Wed Nov 25 13:30:30 2009 -0800
+++ b/src/Make.pkg      Thu Nov 26 15:41:29 2009 -0800
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.

-all: package
+all: package $(BIN)
 package: _obj/$(TARG).a
 testpackage: _test/$(TARG).a

@@ -17,8 +17,8 @@
 nullstring :=
 space := $(nullstring) # a space at the end
 QUOTED_GOROOT=$(subst $(space),\ ,$(GOROOT))
-
-pkgdir=$(QUOTED_GOROOT)/pkg/$(GOOS)_$(GOARCH)
+PREFIX=$(QUOTED_GOROOT)
+pkgdir=$(PREFIX)/pkg/$(GOOS)_$(GOARCH)

 INSTALLFILES=$(pkgdir)/$(TARG).a

@@ -35,7 +35,7 @@
        6cov -g $(shell pwd) $O.out | grep -v '_test\.go:'

 clean:
-       rm -rf *.[$(OS)o] *.a [$(OS)].out *.cgo[12].go *.cgo[34].c *.so _obj _test _testmain.go $(CLEANFILES)
+       rm -rf *.[$(OS)o] *.a [$(OS)].out *.cgo[12].go *.cgo[34].c *.so _obj _test _testmain.go $(CLEANFILES) $(BIN)

 test:
        gotest
@@ -49,14 +49,17 @@
 install: $(INSTALLFILES)

 $(pkgdir)/$(TARG).a: package
-       @test -d $(QUOTED_GOROOT)/pkg && mkdir -p $(pkgdir)/$(dir)
+       @test -d $(PREFIX)/pkg && mkdir -p $(pkgdir)/$(dir)
        cp _obj/$(TARG).a "$@"

+$(BIN): _go_.$(O)
+       $(LD) $(GLFLAGS) -o $(BIN) _go_.$(O)
+
 _go_.$O: $(GOFILES) $(PREREQ)
-       $(GC) -o $@ $(GOFILES)
+       $(GC) $(GOFLAGS) -o $@ $(GOFILES)

 _gotest_.$O: $(GOFILES) $(GOTESTFILES) $(PREREQ)
-       $(GC) -o $@ $(GOFILES) $(GOTESTFILES)
+       $(GC) $(GOFLAGS) -o $@ $(GOFILES) $(GOTESTFILES)

 _obj/$(TARG).a: _go_.$O $(OFILES)
        @mkdir -p _obj/$(dir)
@@ -122,7 +125,7 @@
        gcc $(_CGO_CFLAGS_$(GOARCH)) -o $@ $*.cgo4.o $(CGO_LDFLAGS)  $(_CGO_LDFLAGS_$(GOOS))

 $(pkgdir)/$(dir)/$(elem)_%.so: $(elem)_%.so
-       @test -d $(QUOTED_GOROOT/pkg && mkdir -p $(pkgdir)/$(dir)
+       @test -d $(PREFIX)/pkg && mkdir -p $(pkgdir)/$(dir)
        cp $(elem)_$*.so "$@"

 # Generic build rules.