[Devil-linux-commit] build/scripts iproute2,1.36,1.37

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv16302/scripts

Modified Files:
	iproute2 
Log Message:
make sure the binaries are not found in the wrong directories


Index: iproute2
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iproute2,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- iproute2	3 Mar 2012 15:09:28 -0000	1.36
+++ iproute2	8 Mar 2012 14:18:57 -0000	1.37
@@ -29,7 +29,11 @@
 
 			patch_from_dir ../iproute2-patches || exit 1
 
-			make SBINDIR=/sbin $PMAKE all || exit 1
+			make ROOTDIR=/usr SBINDIR=/sbin $PMAKE all || exit 1
+			
+			#clean up binaries from the old directories
+			rm /usr/sbin/{arpd,ctstat,genl,ifcfg,ifstat,ip,lnstat,nstat,routef,routel,rtacct,rtmon,rtpr,rtstat,ss,tc}
+			make ROOTDIR=/usr SBINDIR=/sbin install || exit 1
 
 		;;