From: Serge L. <sma...@us...> - 2008-04-03 11:37:30
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv29083 Modified Files: net-snmp fprobe fprobe-ulog Log Message: - swap DESTDIR from env variable to make param Index: fprobe =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/fprobe,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- fprobe 22 Feb 2007 14:12:42 -0000 1.2 +++ fprobe 3 Apr 2008 11:37:24 -0000 1.3 @@ -39,7 +39,7 @@ if [ "$CONFIG_FPROBE" = "y" ]; then rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 - DESTDIR=$TMPDIR make install || exit 1 + make install DESTDIR=$TMPDIR || exit 1 copy_docs $TMPDIR cp -dpR $TMPDIR/* $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 Index: fprobe-ulog =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/fprobe-ulog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- fprobe-ulog 1 Feb 2008 10:19:14 -0000 1.1 +++ fprobe-ulog 3 Apr 2008 11:37:24 -0000 1.2 @@ -38,7 +38,7 @@ if [ "$CONFIG_FPROBE_ULOG" = "y" ]; then rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 - DESTDIR=$TMPDIR make install || exit 1 + make install DESTDIR=$TMPDIR || exit 1 copy_docs $TMPDIR cp -dpR $TMPDIR/* $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 Index: net-snmp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/net-snmp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- net-snmp 13 Mar 2008 15:30:04 -0000 1.12 +++ net-snmp 3 Apr 2008 11:37:24 -0000 1.13 @@ -46,11 +46,7 @@ rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 #make -j1 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 + make -j1 install DESTDIR=$TMPDIR || exit 1 copy_docs $TMPDIR rm -rf $TMPDIR/usr/include || exit 1 cp -dpR $TMPDIR/usr/share $CDDIR/usr/ || exit 1 |