From 33fdc2660c5a748efe7563315caefdc3636b2c7f Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Sat, 23 Aug 2003 22:27:42 +0000
Subject: [PATCH] remove obsolete doc copy from iproute2 and fixed iptables to
 use $root/sbin and did a tiny line-move in ffsutils.desc

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1164 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE | 2 ++
 package/base/iproute2/iproute2.conf     | 2 --
 package/base/iptables/iptables.conf     | 4 ++--
 package/base/jfsutils/jfsutils.desc     | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 11ba4931c..3f7b01e4d 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -6,6 +6,8 @@
    kdemultimedia)
  - updated linux26 - and adapted the ROCK kconfig patches
  - updated gnupg and gimp14
+ - remove obsolete doc copy from iproute2 and fixed iptables to use $root/sbin
+ - remove obsolete doc copy from iproute2 and fixed iptables to use $root/sbin
 
 *) 2003-08-22 (2.0.0-camp - 2.0.0-rc1)
 
diff --git a/package/base/iproute2/iproute2.conf b/package/base/iproute2/iproute2.conf
index ab73f3b9b..f001169a2 100644
--- a/package/base/iproute2/iproute2.conf
+++ b/package/base/iproute2/iproute2.conf
@@ -27,8 +27,6 @@ ipr2_pm() {
 		ip/rtacct ip/rtmon ip/rtpr $root/sbin/
 	cp -rv etc/iproute2 $root/etc
 	# install docs
-	cp -rv README README.iproute2+tc RELNOTES doc \
-		examples $docdir
 
 	mkdir -p $root/etc/iproute2
 	for x in etc/iproute2/* ; do
diff --git a/package/base/iptables/iptables.conf b/package/base/iptables/iptables.conf
index 9a94b3d8e..468820b99 100644
--- a/package/base/iptables/iptables.conf
+++ b/package/base/iptables/iptables.conf
@@ -20,8 +20,8 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-var_append makeopt ' ' "PREFIX=$root/$prefix"
-var_append makeinstopt ' ' "PREFIX=$root/$prefix"
+var_append makeopt ' ' "PREFIX=$root/$prefix BINDIR=$root/sbin"
+var_append makeinstopt ' ' "PREFIX=$root/$prefix BINDIR=$root/sbin"
 
 runconf=0
 
diff --git a/package/base/jfsutils/jfsutils.desc b/package/base/jfsutils/jfsutils.desc
index eb5c7822f..bbdae9344 100644
--- a/package/base/jfsutils/jfsutils.desc
+++ b/package/base/jfsutils/jfsutils.desc
@@ -44,6 +44,7 @@
 [V] 1.1.2
 [P] X -----5---9 729.000
 
+[O] sbindir="$root/sbin"
+
 [D] 1160484738 jfsutils-1.1.2.tar.gz http://www10.software.ibm.com/developer/opensource/jfs/project/pub/
 
-[O] sbindir="$root/sbin"