[Devil-linux-commit] build/scripts p7zip,1.7,1.8

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

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

Modified Files:
	p7zip 
Log Message:

- Changes from Alberto Benati 


Index: p7zip
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/p7zip,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- p7zip	23 Mar 2007 22:36:28 -0000	1.7
+++ p7zip	21 May 2008 15:04:14 -0000	1.8
@@ -33,10 +33,10 @@
 			#cp makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine || exit 1
 			#cp makefile.linux_x86_ppc_alpha makefile.machine || exit 1
 			
-			pushd 7zip/Bundles/Un7Zip > /dev/null || exit 1
+			pushd CPP/7zip/Bundles/Un7Zip > /dev/null || exit 1
 			
 			#make CXX=/opt/gcc-3.x/bin/g++ $PMAKE || exit 1
-			make $PMAKE || exit 1
+			make all $PMAKE || exit 1
 			
 			# We should install libs immediately
 			install -s -D -m 755 libun7zip.so /usr/lib/libun7zip.so || exit 1
@@ -47,7 +47,7 @@
 
 	install )
 		if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then
-			install -s -D -m 755 7zip/Bundles/Un7Zip/libun7zip.so $CDDIR/usr/lib/libun7zip.so || exit 1
+			install -s -D -m 755 CPP/7zip/Bundles/Un7Zip/libun7zip.so $CDDIR/usr/lib/libun7zip.so || exit 1
 		fi
 		;;