promotions validated
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/tags/sa-update_3.3.0_20090701105812@790112 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build/mkupdates/run_part2 b/build/mkupdates/run_part2
index 9ac1a48..763d10f 100755
--- a/build/mkupdates/run_part2
+++ b/build/mkupdates/run_part2
@@ -78,9 +78,7 @@
# and ensure the ruleset lints!
./spamassassin --lint || exit $?
-make install || exit $?
-
-rulesdir=$tmpdir/share/spamassassin
+rulesdir=rules
(
cd $rulesdir
@@ -105,9 +103,18 @@
gunzip -cd < $tmpdir/update.tgz | tar xf - || exit $?
)
+sitetmp=$tmpdir/sitetmp
+rm -rf $sitetmp
+mkdir $sitetmp
+(
+ cp $rulesdir/*.pre $sitetmp
+ cd $sitetmp
+)
+
# now, ensure the ruleset (entirely as distributed) lints, also.
# use "-p /dev/null" so any user_prefs data is ignored.
-./spamassassin -x --configpath=$linttmp -p /dev/null --lint \
+./spamassassin -x --configpath=$linttmp --siteconfigpath=$sitetmp \
+ -p /dev/null --lint \
|| exit $?
# sign and get sums