[Devil-linux-commit] build/scripts dante,1.1.2.5,1.1.2.6

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

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

Modified Files:
      Tag: rel-1-2-patches
	dante 
Log Message:
more ssp fixes


Index: dante
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dante,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- dante	16 Oct 2007 13:44:06 -0000	1.1.2.5
+++ dante	16 Oct 2007 20:56:37 -0000	1.1.2.6
@@ -45,7 +45,11 @@
 	if [ "$CONFIG_DANTE" = "y" ]; then
 	    rm -rf $TMPDIR || exit 1
 	    mkdir -p $TMPDIR || exit 1
-	    make CC="gcc -fno-stack-protector" install DESTDIR=$TMPDIR || exit 1
+            if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
+		make CC="gcc -fno-stack-protector" install DESTDIR=$TMPDIR || exit 1
+	    else
+		make install DESTDIR=$TMPDIR || exit 1
+	    fi
 	    mkdir -p $TMPDIR/etc/socks || exit 1
 	    cp ./example/*conf  $TMPDIR/etc/socks || exit 1
 	    copy_docs $TMPDIR