[Devil-linux-commit] build/scripts clamav,1.15,1.16

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

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

Modified Files:
	clamav 
Log Message:

- $TMPDIR recovered


Index: clamav
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/clamav,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- clamav	17 Oct 2005 13:05:39 -0000	1.15
+++ clamav	17 Oct 2005 13:27:15 -0000	1.16
@@ -44,23 +44,23 @@
 
 	install )
 	    if [ "$CONFIG_CLAMAV" = "y" ]; then
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp/usr/sbin || exit 1
-		make install DESTDIR=$WORKDIR/tmp || exit 1
+		rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR/usr/sbin || exit 1
+		make install DESTDIR=$TMPDIR || exit 1
 
-		copy_docs $WORKDIR/tmp
+		copy_docs $TMPDIR
 
 		cp etc/*conf $ETCDIR/etc/ || exit 1
 
 		useradd -u 45 -s /bin/false -g vscan clamav || exit 1
 
-		rm -rf $WORKDIR/tmp/usr/include || exit 1
-		rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
-		copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
+		rm -rf $TMPDIR/usr/include || exit 1
+		rm -rf $TMPDIR/usr/lib/*a || exit 1
+		copy_files $TMPDIR/usr $CDDIR/ || exit 1
 		mkdir -p $CDDIR/var/lib/clamav || exit 1
 		chmod -R 700 $CDDIR/var/lib/clamav || exit 1
 		chown -R clamav $CDDIR/var/lib/clamav || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
+		rm -rf $TMPDIR || exit 1
 
 		cp -dp $MYDIR/scripts/clamav $ETCDIR/etc/init.d/ || exit 1
 		echo "# Start ClamAV daemon?" >> $CONFIGFILE