From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 5 Nov 2004 01:34:06 +0000 (+0000)
Subject: $CC -> $(tc-getCC)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d06b45ace4fd59307cbfe3e54068dd398b1c2249;p=gentoo.git

$CC -> $(tc-getCC)
---

diff --git a/sys-apps/mii-diag/mii-diag-2.07.ebuild b/sys-apps/mii-diag/mii-diag-2.07.ebuild
index cf8805754306..174581080f14 100644
--- a/sys-apps/mii-diag/mii-diag-2.07.ebuild
+++ b/sys-apps/mii-diag/mii-diag-2.07.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/mii-diag-2.07.ebuild,v 1.7 2004/06/24 22:16:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/mii-diag-2.07.ebuild,v 1.8 2004/11/05 01:25:25 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MIIVER=${PV}
 LIBVER=2.04
@@ -13,27 +13,30 @@ HOMEPAGE="http://www.scyld.com/diag/"
 # with version suffixes.
 SRC_URI=""	# ftp://ftp.scyld.com/pub/diag/mii-diag.c
 			# ftp://ftp.scyld.com/pub/diag/libmii.c
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 alpha"
+KEYWORDS="alpha amd64 x86"
 IUSE=""
+
 DEPEND=""
 
+S=${WORKDIR}
+
 src_unpack() {
-	mkdir -p ${S} || die
-	cd ${S} || die
-	cp ${FILESDIR}/mii-diag.c-${MIIVER} mii-diag.c || die
-	cp ${FILESDIR}/libmii.c-${LIBVER} libmii.c || die
-	epatch ${FILESDIR}/mii-diag.c-2.07-gcc33.patch # epatch contains die
+	cp ${FILESDIR}/mii-diag.c-${MIIVER} mii-diag.c || die "mii-diag.c"
+	cp ${FILESDIR}/libmii.c-${LIBVER} libmii.c || die "libmii.c"
+	epatch ${FILESDIR}/mii-diag.c-${PV}-gcc33.patch
 }
 
 src_compile() {
 	# Don't change -O below, it is a requirement for building these
 	# programs.  See http://www.scyld.com/diag/#compiling
-	${CC-gcc} -O -c libmii.c || die
-	${CC-gcc} -O -DLIBMII mii-diag.c libmii.o -o mii-diag || die
+	$(tc-getCC) -O -c libmii.c || die
+	$(tc-getCC) -O -DLIBMII mii-diag.c libmii.o -o mii-diag || die
 }
 
 src_install() {
-	into /; dosbin mii-diag || die
+	into /
+	dosbin mii-diag || die
 }
diff --git a/sys-apps/mii-diag/mii-diag-2.09.ebuild b/sys-apps/mii-diag/mii-diag-2.09.ebuild
index d1bec5884489..14631696bd9c 100644
--- a/sys-apps/mii-diag/mii-diag-2.09.ebuild
+++ b/sys-apps/mii-diag/mii-diag-2.09.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/mii-diag-2.09.ebuild,v 1.3 2004/06/24 22:16:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/mii-diag-2.09.ebuild,v 1.4 2004/11/05 01:25:25 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MIIVER=${PV}
 LIBVER=2.10
@@ -13,27 +13,30 @@ HOMEPAGE="http://www.scyld.com/diag/"
 # with version suffixes.
 SRC_URI=""	# ftp://ftp.scyld.com/pub/diag/mii-diag.c
 			# ftp://ftp.scyld.com/pub/diag/libmii.c
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~alpha"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
+
 DEPEND=""
 
+S=${WORKDIR}
+
 src_unpack() {
-	mkdir -p ${S} || die
-	cd ${S} || die
-	cp ${FILESDIR}/mii-diag.c-${MIIVER} mii-diag.c || die
-	cp ${FILESDIR}/libmii.c-${LIBVER} libmii.c     || die
-	epatch ${FILESDIR}/mii-diag.c-2.09-gcc33.patch # epatch contains die
+	cp ${FILESDIR}/mii-diag.c-${MIIVER} mii-diag.c || die "mii-diag.c"
+	cp ${FILESDIR}/libmii.c-${LIBVER} libmii.c || die "libmii.c"
+	epatch ${FILESDIR}/mii-diag.c-${PV}-gcc33.patch
 }
 
 src_compile() {
 	# Don't change -O below, it is a requirement for building these
 	# programs.  See http://www.scyld.com/diag/#compiling
-	${CC-gcc} -O -c libmii.c || die
-	${CC-gcc} -O -DLIBMII mii-diag.c libmii.o -o mii-diag || die
+	$(tc-getCC) -O -c libmii.c || die
+	$(tc-getCC) -O -DLIBMII mii-diag.c libmii.o -o mii-diag || die
 }
 
 src_install() {
-	into /; dosbin mii-diag || die
+	into /
+	dosbin mii-diag || die
 }
diff --git a/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild b/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild
index 26930303004f..8291d211b798 100644
--- a/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild
+++ b/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild
@@ -1,26 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild,v 1.7 2004/07/15 02:00:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mpi350-driver/mpi350-driver-2.0.ebuild,v 1.8 2004/11/05 01:27:21 vapier Exp $
 
 DESCRIPTION="Cisco's wireless drivers and utilities"
-
 HOMEPAGE="http://www.cisco.com/"
-
-SRC_DOWNLOAD="http://www.cisco.com/public/sw-center/sw-wireless.shtml"
 SRC_URI="Linux-ACU-Driver-v2.0.tar.gz"
-RESTRICT="fetch"
 
 LICENSE="MPL-1.1"
-
 SLOT="0"
-KEYWORDS="x86 amd64 -ppc -sparc"
-
+KEYWORDS="amd64 x86"
 IUSE=""
+RESTRICT="fetch"
 
 DEPEND=""
 
-MOD_DIR="/lib/modules/`uname -r`"
-KERNEL_SRC="/usr/src/linux"
+MOD_DIR="/lib/modules/${KV}"
+KERNEL_SRC="${ROOT}/usr/src/linux"
 
 # ------------------------------------------------- #
 # The script that Cisco provides is basically
@@ -31,14 +26,9 @@ KERNEL_SRC="/usr/src/linux"
 # ------------------------------------------------- #
 
 pkg_nofetch() {
-	eerror "Please download ${SRC_URI} from ${SRC_DOWNLOAD}"
-	eerror "and put it in ${DISTDIR}."
-}
-
-src_unpack() {
-	mkdir ${S}
-	cd ${S}
-	unpack ${A}
+	einfo "Please download ${SRC_URI} from"
+	einfo "http://www.cisco.com/public/sw-center/sw-wireless.shtml"
+	einfo "and put it in ${DISTDIR}"
 }
 
 src_compile() {
@@ -47,8 +37,7 @@ src_compile() {
 	# Thus we compile them by hand here.
 
 	cd ${S}/driver
-	einfo "Compiling mpi350.o"
-	${CC} -MD -Wall -I${KERNEL_SRC}/include -D__KERNEL__ -DMODULE -c ${S}/driver/mpi350.c
+	$(tc-getCC) -MD -Wall -I${KERNEL_SRC}/include -D__KERNEL__ -DMODULE -c ${S}/driver/mpi350.c || die
 }
 
 src_install() {
@@ -80,6 +69,7 @@ src_install() {
 	cd ${S}
 	dodoc ethX.cfg readme.txt
 }
+
 pkg_postinst() {
 	einfo "The cisco utilities are placed in /opt/cisco/bin"
 	einfo "To use them either add them to your PATH, or"
diff --git a/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild b/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild
index 7fd3faf0139c..12b8ea45694f 100644
--- a/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild
+++ b/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild,v 1.15 2004/07/15 02:36:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/supervise-scripts/supervise-scripts-3.4.ebuild,v 1.16 2004/11/05 01:28:34 vapier Exp $
 
-DESCRIPTION="Starting and stopping daemontools managed services."
+DESCRIPTION="Starting and stopping daemontools managed services"
 HOMEPAGE="http://untroubled.org/supervise-scripts/"
 SRC_URI="http://untroubled.org/supervise-scripts/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-apps/daemontools-0.70"
@@ -23,7 +23,7 @@ src_install() {
 		svc-add svc-isdown svc-isup svc-remove \
 		svc-start svc-status svc-stop \
 		svc-waitdown svc-waitup svscan-add-to-inittab \
-		svscan-start svscan-stopall
-	dodoc ANNOUNCEMENT COPYING ChangeLog NEWS README TODO VERSION
+		svscan-start svscan-stopall || die
+	dodoc ANNOUNCEMENT ChangeLog NEWS README TODO VERSION
 	doman *.[0-9]
 }
diff --git a/sys-apps/supervise-scripts/supervise-scripts-3.5.ebuild b/sys-apps/supervise-scripts/supervise-scripts-3.5.ebuild
index 9c1a97c712a2..018e49c24539 100644
--- a/sys-apps/supervise-scripts/supervise-scripts-3.5.ebuild
+++ b/sys-apps/supervise-scripts/supervise-scripts-3.5.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/supervise-scripts/supervise-scripts-3.5.ebuild,v 1.12 2004/09/03 21:03:24 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/supervise-scripts/supervise-scripts-3.5.ebuild,v 1.13 2004/11/05 01:28:34 vapier Exp $
 
 inherit fixheadtails
-DESCRIPTION="Starting and stopping daemontools managed services."
+
+DESCRIPTION="Starting and stopping daemontools managed services"
 HOMEPAGE="http://untroubled.org/supervise-scripts/"
 SRC_URI="http://untroubled.org/supervise-scripts/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-apps/daemontools-0.70"
 DEPEND=">=sys-apps/daemontools-0.70
-		 dev-libs/bglibs
-		 sys-devel/gcc-config"
+	dev-libs/bglibs
+	sys-devel/gcc-config"
 
 src_unpack() {
 	unpack ${A}
@@ -23,8 +24,8 @@ src_unpack() {
 	echo '/usr/bin' > conf-bin
 	echo '/usr/lib/bglibs/lib' > conf-bglibs
 	echo '/usr/lib/bglibs/include' > conf-bgincs
-	echo "${CC} ${CFLAGS}" >conf-cc
-	echo "${CC} ${LDFLAGS}" >conf-ld
+	echo "$(tc-getCC) ${CFLAGS}" >conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" >conf-ld
 	ht_fix_file svscan-add-to-inittab.in Makefile
 }
 
@@ -37,7 +38,7 @@ src_install() {
 	dobin svc-add svc-isdown svc-isup svc-remove \
 		svc-start svc-status svc-stop svc-restart \
 		svc-waitdown svc-waitup svscan-add-to-inittab \
-		svscan-add-to-inittab svscan-start svscan-stopall
-	dodoc ANNOUNCEMENT COPYING ChangeLog NEWS README TODO VERSION
+		svscan-add-to-inittab svscan-start svscan-stopall || die
+	dodoc ANNOUNCEMENT ChangeLog NEWS README TODO VERSION
 	doman *.[0-9]
 }
diff --git a/sys-apps/sysvinit/sysvinit-2.84.ebuild b/sys-apps/sysvinit/sysvinit-2.84.ebuild
index d8663f12c44e..2a6cce56e597 100644
--- a/sys-apps/sysvinit/sysvinit-2.84.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.84.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.84.ebuild,v 1.6 2004/08/19 22:05:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.84.ebuild,v 1.7 2004/11/05 01:30:50 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="/sbin/init - parent of all processes"
 HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
@@ -40,7 +40,7 @@ src_unpack() {
 
 src_compile() {
 	cd ${S}/src
-	emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
 		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} -D_GNU_SOURCE" || die
 }
 
diff --git a/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild
index edc12c247c75..ce400469da86 100644
--- a/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild,v 1.6 2004/08/24 03:37:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild,v 1.7 2004/11/05 01:30:50 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="/sbin/init - parent of all processes"
 HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="selinux bootstrap build"
 
 RDEPEND="selinux? ( >=sys-libs/libselinux-1.14 )"
@@ -35,7 +35,7 @@ src_compile() {
 	# the shared obj by default anyway!  The other option is to
 	# refrain from building sulogin, but that isn't a good option.
 	# (09 Jul 2004 agriffis)
-	emake -C ${S}/src CC="${CC:-gcc}" LD="${CC:-gcc}" \
+	emake -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC)" \
 		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} -D_GNU_SOURCE" \
 		LCRYPT="-lcrypt" || die
 }
@@ -43,9 +43,9 @@ src_compile() {
 src_install() {
 	cd ${S}/src
 	into /
-	dosbin init halt killall5 runlevel shutdown sulogin
+	dosbin init halt killall5 runlevel shutdown sulogin || die "dosbin"
 	dosym init /sbin/telinit
-	dobin last mesg utmpdump wall
+	dobin last mesg utmpdump wall || die "dobin"
 	dosym killall5 /sbin/pidof
 	dosym halt /sbin/reboot
 	dosym halt /sbin/poweroff
@@ -56,7 +56,7 @@ src_install() {
 	# sysvinit docs
 	cd ${S}
 	doman man/*.[1-9]
-	dodoc COPYRIGHT README doc/*
+	dodoc README doc/*
 
 	# install our inittab
 	insinto /etc
diff --git a/sys-apps/sysvinit/sysvinit-2.85.ebuild b/sys-apps/sysvinit/sysvinit-2.85.ebuild
index 446110da3102..d4eec81ae9a9 100644
--- a/sys-apps/sysvinit/sysvinit-2.85.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.85.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.85.ebuild,v 1.5 2004/08/19 22:05:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.85.ebuild,v 1.6 2004/11/05 01:30:50 vapier Exp $
 
 inherit eutils
 
@@ -35,7 +35,7 @@ src_unpack() {
 
 src_compile() {
 	cd ${S}/src
-	emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
 		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} -D_GNU_SOURCE" || die
 }
 
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild
index 17ef5db5d3f9..9503dcab0ff5 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild,v 1.17 2004/10/23 05:45:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild,v 1.18 2004/11/05 01:33:20 vapier Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 HOMEPAGE="http://cr.yp.to/ucspi-tcp.html"
@@ -14,12 +14,13 @@ SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~ppc-macos sparc s390 x86"
 IUSE="ssl ipv6 selinux"
 
 DEPEND="virtual/libc
 	ssl? ( >=dev-libs/openssl-0.9.6g )"
-RDEPEND="selinux? ( sec-policy/selinux-ucspi-tcp )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-ucspi-tcp )"
 PROVIDE="virtual/inetd"
 
 src_unpack() {
@@ -41,8 +42,8 @@ src_unpack() {
 	epatch ${DISTDIR}/ucspi-rss.diff
 	epatch ${FILESDIR}/${PV}-head-1.patch
 
-	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(gcc-getCC) ${LDFLAGS}" > conf-ld
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
 	echo "/usr/" > conf-home
 
 	# allow larger responses
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild
index 403ff5d638da..a5db26f3d099 100644
--- a/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild
@@ -1,37 +1,34 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild,v 1.6 2004/10/17 11:22:50 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild,v 1.7 2004/11/05 01:34:06 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
-DESCRIPTION="A ucspi implementation for unix sockets."
+DESCRIPTION="A ucspi implementation for unix sockets"
+HOMEPAGE="http://untroubled.org/ucspi-unix/"
 SRC_URI="http://untroubled.org/ucspi-unix/${P}.tar.gz"
 
-DEPEND=">=dev-libs/bglibs-1.009-r1"
-HOMEPAGE="http://untroubled.org/ucspi-unix/"
-KEYWORDS="x86 amd64 sparc ~ppc"
-IUSE=""
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.009-r1"
 
 src_unpack() {
 	unpack ${A}
-
-	# Fix for head syntax in Makefile
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gentoo-head.patch
 }
 
 src_compile() {
-	echo "${CC} ${CFLAGS} -I/usr/lib/bglibs/include" > conf-cc
-	echo "${CC} -s -L/usr/lib/bglibs/lib" > conf-ld
+	echo "$(tc-getCC) ${CFLAGS} -I${ROOT}/usr/lib/bglibs/include" > conf-cc
+	echo "$(tc-getCC) -s -L${ROOT}/usr/lib/bglibs/lib" > conf-ld
 	make || die  #don't use emake b/c of jobserver
 }
 
-src_install () {
-	exeinto /usr/bin
-	doexe unixserver unixclient unixcat
+src_install() {
+	dobin unixserver unixclient unixcat || die
 	doman unixserver.1 unixclient.1
-
 	dodoc ANNOUNCEMENT ChangeLog NEWS PROTOCOL README TODO
 }