[Devil-linux-commit] build/scripts bzip2,1.13,1.14

[Heiko Z. <smi...@us...>]

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

Modified Files:
	bzip2 
Log Message:
- updated bzip2 to 1.0.4
- updated fetchmail to 6.3.6
- updated fwlogwatch to 1.1
- updated nagios to 2.6
- updated nagios-plugins to 1.4.5
- updated nrpe to 2.6
- updated nsca to 2.7
- updated ntp to 4.2.4
- updated postfix to 2.3.6
- updated sarg to 2.2.3.1
- updated shorewall to 3.2.7


Index: bzip2
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/bzip2,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- bzip2	19 Dec 2004 16:17:51 -0000	1.13
+++ bzip2	8 Jan 2007 14:25:51 -0000	1.14
@@ -41,7 +41,7 @@
 case $1 in
 	build )
 		make $PMAKE -f Makefile-libbz2_so  || exit 1
-		make $PMAKE  || exit 1
+		make $PMAKE || exit 1
 		strip_debug
 
 		#remove those damned hardlinks
@@ -55,21 +55,20 @@
 
 		# make sure the system uses the right libs
 		replace_str Makefile "ln \$(" "ln -sf \$("
-		make install  || exit 1
+		make install PREFIX=/usr || exit 1
 
 		fixbz2
 		;;
 
 	install )
-		rm -rf $TMPDIR
-		mkdir -p $TMPDIR/{bin,lib,usr} || exit 1
-		make install PREFIX=$TMPDIR/usr || exit 1
-		fixbz2 $TMPDIR
-		copy_docs $TMPDIR
-		rm -rf $TMPDIR/usr/include || exit 1
-		rm -rf $TMPDIR/usr/lib/*.a || exit 1
-		cp -dpR $TMPDIR/* $CDDIR/ || exit 1
-		rm -rf $TMPDIR
+		rm -rf $WORKDIR/tmp
+		mkdir -p $WORKDIR/tmp/{bin,lib,usr} || exit 1
+		make install PREFIX=$WORKDIR/tmp/usr || exit 1
+		fixbz2 $WORKDIR/tmp
+		copy_docs $WORKDIR/tmp
+		rm -rf $WORKDIR/tmp/usr/include || exit 1
+		rm -rf $WORKDIR/tmp/usr/lib/*.a || exit 1
+		cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
 		;;
 
 	* )