[Glibc-bsd-commits] r1345 - trunk/freebsd-utils/debian

[Robert Millan]

Author: rmh
Date: 2006-03-18 13:00:15 +0000 (Sat, 18 Mar 2006)
New Revision: 1345

Modified:
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/rules
Log:
Hack _PATH_SYSPATH out, and link with libbsd.

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-03-18 12:56:33 UTC (rev 1344)
+++ trunk/freebsd-utils/debian/control	2006-03-18 13:00:15 UTC (rev 1345)
@@ -3,7 +3,7 @@
 Priority: required
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libedit-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libedit-dev, libbsd-dev
 Standards-Version: 3.6.0
 
 Package: freebsd-utils

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-03-18 12:56:33 UTC (rev 1344)
+++ trunk/freebsd-utils/debian/rules	2006-03-18 13:00:15 UTC (rev 1345)
@@ -12,7 +12,7 @@
 PATH:=/usr/lib/freebsd:$(PATH)
 DESTDIR=$(CURDIR)/debian/$(package)
 PMAKE=make COPTS="-D_GNU_SOURCE" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR)
-export LDADD=-ledit
+export LDADD=-ledit -lbsd
 
 dirs=dmesg mount umount swapon sysctl
 
@@ -21,6 +21,7 @@
 		-e "/^__FBSDID/d" -e "s,<sys/queue.h>,<bsd/queue.h>,g" -e "s/^LDADD=/LDADD+=/g" \
 		-e "/[ \t]*__dead2[ \t]*/d" \
 		-e "s/getline/bsd_&/g" \
+		-e "s,_PATH_SYSPATH,\"/sbin:/usr/sbin\",g" \
 	; done)
 	set -e ; for i in $(dirs) ; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/sbin/$$i ; \