[Devil-linux-commit] build/scripts iptables,1.33,1.34

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv15608

Modified Files:
	iptables 
Log Message:

- update iptables to 1.4.1.1


Index: iptables
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iptables,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- iptables	13 Feb 2008 15:20:11 -0000	1.33
+++ iptables	24 Jul 2008 22:02:29 -0000	1.34
@@ -33,15 +33,15 @@
 		bzcat $DL_DIR/src/IMQ-iptables*bz2 | patch -p1 || exit 1
 		chmod +x extensions/.IMQ-test*
 	fi
-
-	replace_str Makefile "/usr/local" "/usr"
+	./configure --prefix=/usr --with-ksource=$KERNELDIR || exit 1
+	#replace_str Makefile "/usr/local" "/usr"
 	# seems like iptables comple is unhappy in some circumstances, let's see if that makes it better
 	make clean
 	# parallel build failes, do not use $PMAKE
-	make all COPT_FLAGS="$FLAGS" KERNEL_DIR=$KERNELDIR || exit 1
+	make all COPT_FLAGS="$FLAGS" || exit 1
 	strip_debug
 	# install it, so other programs can use it
-	make install install-devel || exit 1
+	make install || exit 1
         ;;
 
     install )
@@ -54,9 +54,9 @@
         mkdir -p $TMPDIR/usr/share/man/man{1,2,5,8} || exit 1
         make install KERNEL_DIR=$KERNELDIR DESTDIR=$TMPDIR || exit 1
 	copy_docs $TMPDIR
+        copy_files $TMPDIR/usr/bin $CDDIR/usr || exit 1
         copy_files $TMPDIR/usr/sbin $CDDIR/usr || exit 1
-        copy_files $TMPDIR/usr/lib $CDDIR/usr || exit 1
-        copy_files "extensions/*.so" $CDDIR/usr/lib/iptables/ || exit 1
+        copy_files $TMPDIR/usr/libexec $CDDIR/usr || exit 1
         rm -rf $TMPDIR || exit 1
     	;;