[Devil-linux-commit] build/scripts sagator,1.6.2.2,1.6.2.3

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

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

Modified Files:
      Tag: rel-1-2-patches
	sagator 
Log Message:
sagator now uses a config program


Index: sagator
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sagator,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- sagator	26 Jun 2004 15:27:36 -0000	1.6.2.2
+++ sagator	13 Apr 2005 23:10:14 -0000	1.6.2.3
@@ -28,28 +28,29 @@
 case $1 in
 	build )
 		if [ "$CONFIG_SAGATOR" = "y" ]; then
-			replace_str Makefile python2.2 python2.3
+			#replace_str Makefile python2.2 python2.3
 			export PYTHONHOME=$WORKDIR/Python-install/usr
 			export PATH=$WORKDIR/Python-install/usr/bin:$PATH
-			make PYTHONVER=$PYTHONVER $PMAKE all || exit 1
+			./configure --prefix /usr || exit 1
+			make $PMAKE all || exit 1
 			strip_debug
 		    fi
 		;;
 
 	install )
 		if [ "$CONFIG_SAGATOR" = "y" ]; then
-			rm -rf $WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp/usr/sbin || exit 1
-			make PYTHONVER=$PYTHONVER install DESTDIR=$WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR/usr/sbin || exit 1
+			make install DESTDIR=$TMPDIR || exit 1
 
-			rm -rf $WORKDIR/tmp/etc/rc.d || exit 1
-			rm -rf $WORKDIR/tmp/etc/sysconfig || exit 1
-			cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
+			rm -rf $TMPDIR/etc/rc.d || exit 1
+			rm -rf $TMPDIR/etc/sysconfig || exit 1
+			cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
 			cp -dp $MYDIR/scripts/sagator $ETCDIR/etc/init.d/ || exit 1
 
-			rm -rf $WORKDIR/tmp/usr/share || exit 1
-			copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
-			rm -rf $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR/usr/share || exit 1
+			copy_files $TMPDIR/usr $CDDIR/ || exit 1
+			rm -rf $TMPDIR || exit 1
 
 			mkdir -p $DOCDIR/sagator || exit 1
 			cp -dp README* TODO $DOCDIR/sagator || exit 1