[Devil-linux-commit] build/scripts net-snmp,1.4.2.5,1.4.2.6

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

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

Modified Files:
      Tag: rel-1-2-patches
	net-snmp 
Log Message:

 oops... once again
- added marker for the patch
- modifyed Makefiles to simplify installation process
- added net-snmp perl modules (were missed by previous installation script)









Index: net-snmp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/net-snmp,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -d -r1.4.2.5 -r1.4.2.6
--- net-snmp	21 Mar 2008 19:46:04 -0000	1.4.2.5
+++ net-snmp	21 Mar 2008 20:01:05 -0000	1.4.2.6
@@ -29,13 +29,14 @@
 	build )
 		if [ "$CONFIG_NET_SNMP" = "y" ]; then
 			# HOT-FIX
-			bzcat $SRCDIR/net-snmp.ntop.patch.bz2 | patch -p0 || exit 1
+			if [ ! -e .net-snmp.ntop.patch ]; then
+				bzcat $SRCDIR/net-snmp.ntop.patch.bz2 | patch -p0 || exit 1
+				touch .net-snmp.ntop.patch
+			fi
 			./configure --prefix=/usr --disable-debugging --sysconfdir=/etc --localstatedir=/var --with-defaults --enable-shared --enable-ipv6  --enable-ucd-compatibility --with-zlib --with-mib-modules="smux" || exit 1
 			# disable parallel builds
 			make all || exit 1
 			strip_debug
-			#mkdir -p $WORKDIR/LIBS/net-snmp || exit 1
-			#make install prefix=$WORKDIR/LIBS/net-snmp/usr exec_prefix=$WORKDIR/LIBS/net-snmp/usr sysconfdir=$WORKDIR/LIBS/net-snmp/etc persistentdir=$WORKDIR/LIBS/net-snmp/var/net-snmp || exit 1
 			make install || exit 1
 		fi
 		;;
@@ -44,7 +45,12 @@
 		if [ "$CONFIG_NET_SNMP" = "y" ]; then
 			rm -rf $TMPDIR || exit 1
 			mkdir -p $TMPDIR || exit 1
-			make install prefix=$TMPDIR/usr exec_prefix=$TMPDIR/usr sysconfdir=$TMPDIR/etc persistentdir=$TMPDIR/var/net-snmp || exit 1
+			#make install prefix=$TMPDIR/usr exec_prefix=$TMPDIR/usr sysconfdir=$TMPDIR/etc persistentdir=$TMPDIR/var/net-snmp || exit 1
+			for i in `find -name Makefile` 
+			 do 
+			   delete_str $i '^DESTDIR' 
+			 done
+			DESTDIR=$TMPDIR make -j1 install || exit 1
 			copy_docs $TMPDIR
 			rm -rf $TMPDIR/usr/include || exit 1
 			cp -dpR $TMPDIR/usr/share $CDDIR/usr/ || exit 1