[Devil-linux-commit] build/scripts Mail-SpamAssassin, 1.8.2.2, 1.8.2.3

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

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

Modified Files:
      Tag: rel-1-2-patches
	Mail-SpamAssassin 
Log Message:
fixes for $TMPDIR


Index: Mail-SpamAssassin
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Mail-SpamAssassin,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -d -r1.8.2.2 -r1.8.2.3
--- Mail-SpamAssassin	21 Feb 2008 20:34:37 -0000	1.8.2.2
+++ Mail-SpamAssassin	22 Feb 2008 14:27:39 -0000	1.8.2.3
@@ -27,7 +27,7 @@
 case $1 in
 	build )
 		if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then
-			perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc DESTDIR=$TMPDIR ENABLE_SSL=yes < /dev/null || exit 1
+			perl Makefile.PL PREFIX=/usr SYSCONFDIR=/etc ENABLE_SSL=yes < /dev/null || exit 1
 			# now override the PREFIX setting to not use $TMPDIR%. MakeMaker
 			# does not have a better way to do this, it seems...
 			make $PMAKE PREFIX=/usr || exit 1
@@ -40,8 +40,9 @@
 	install )
 		if [ "$CONFIG_MAIL_SPAMASSASSIN" = "y" ]; then
 			rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR/usr/lib || exit 1
 
-			make install || exit 1
+			make DESTDIR=$TMPDIR install || exit 1
 
 			install -m 0755 spamd/libspamc.so $TMPDIR/usr/lib || exit 1