From: Russ Cox <rsc@golang.org>
Date: Fri, 18 Dec 2009 01:28:22 +0000 (-0800)
Subject: Make.pkg: fix cgo for TARG=a/b
X-Git-Tag: weekly.2009-12-22~16
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=10e85dfee4d2a5e905045bdc17e5505ed1d3efa7;p=gostls13.git

Make.pkg: fix cgo for TARG=a/b

R=dho, phf
CC=golang-dev
https://golang.org/cl/180082
---

diff --git a/src/Make.pkg b/src/Make.pkg
index 489aa78c27..890f43d490 100644
--- a/src/Make.pkg
+++ b/src/Make.pkg
@@ -41,7 +41,7 @@ GOFILES+=$(patsubst %.go,%.cgo1.go,$(CGOFILES))
 GOFILES+=_cgo_gotypes.go
 OFILES+=_cgo_defun.$O
 GCC_OFILES=$(patsubst %.go,%.cgo2.o,$(CGOFILES))
-INSTALLFILES+=$(pkgdir)/$(dir)/$(TARG).so
+INSTALLFILES+=$(pkgdir)/$(TARG).so
 PREREQ+=$(patsubst %,%.make,$(DEPS))
 endif
 
@@ -148,7 +148,7 @@ _cgo_defun.$O: _cgo_defun.c
 _cgo_.so: $(GCC_OFILES)
 	gcc $(_CGO_CFLAGS_$(GOARCH)) -o $@ $(GCC_OFILES) $(CGO_LDFLAGS)  $(_CGO_LDFLAGS_$(GOOS))
 
-$(pkgdir)/$(dir)/$(TARG).so: _cgo_.so
+$(pkgdir)/$(TARG).so: _cgo_.so
 	@test -d $(QUOTED_GOROOT/pkg && mkdir -p $(pkgdir)/$(dir)
 	cp _cgo_.so "$@"