INN commit: trunk (3 files)

[INN Commit]

    Date: Tuesday, August 14, 2007 @ 11:46:00
  Author: iulius
Revision: 7645

Use @bindir@ and @sysconfdir@ instead of @prefix@/bin and @prefix@/etc
which may be different.

Modified:
  trunk/backends/news2mail.in
  trunk/control/controlbatch.in
  trunk/control/controlchan.in

-------------------------+
 backends/news2mail.in   |    4 ++--
 control/controlbatch.in |    4 ++--
 control/controlchan.in  |    4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

Modified: backends/news2mail.in
===================================================================
--- backends/news2mail.in	2007-08-13 14:22:26 UTC (rev 7644)
+++ backends/news2mail.in	2007-08-14 18:46:00 UTC (rev 7645)
@@ -10,7 +10,7 @@
 # it down sendmail's throat.
 # 
 # This program expect to find a file that maps listname to listaddrs,
-#	@prefix@/etc/news2mail.cf
+#	@sysconfdir@/news2mail.cf
 # which must contain address mapping pairs such as
 #
 #	big-red-ants at ucsd.edu	big-red-ants-digest at ucsd.edu		
@@ -22,7 +22,7 @@
 # the article to.
 #
 # In the INN newsfeeds file, you need to have a channel feed:
-#	n2m!:!*:Tc,Ac,Wn*:@prefix@/bin/news2mail
+#	n2m!:!*:Tc,Ac,Wn*:@bindir@/news2mail
 # and a site for each of the various mailing lists you're feeding,
 # such as
 #	big-red-ants at ucsd.edu:rec.pets.redants.*:Tm:n2m!

Modified: control/controlbatch.in
===================================================================
--- control/controlbatch.in	2007-08-13 14:22:26 UTC (rev 7644)
+++ control/controlbatch.in	2007-08-14 18:46:00 UTC (rev 7645)
@@ -18,7 +18,7 @@
 # If you're doing the channel thing, you might want to put something
 # like this in your crontab to do a cleanup in the wee hours:
 #
-#	00 04 * * *	@prefix@/bin/controlbatch
+#	00 04 * * *	@bindir@/controlbatch
 #
 ########################################################################
 #
@@ -32,7 +32,7 @@
 #
 # And, a crontab entry something like this:
 #
-#	30 * * * *     @prefix@/bin/controlbatch
+#	30 * * * *     @bindir@/controlbatch
 #
 ########################################################################
 

Modified: control/controlchan.in
===================================================================
--- control/controlchan.in	2007-08-13 14:22:26 UTC (rev 7644)
+++ control/controlchan.in	2007-08-14 18:46:00 UTC (rev 7645)
@@ -27,7 +27,7 @@
 ##  controlchan!\
 ##     :!*,control,control.*,!control.cancel\
 ##     :Tc,Wnsm\
-##     :@prefix@/bin/controlchan
+##     :@bindir@/controlchan
 
 require 5.004_03;
 use strict;
@@ -280,6 +280,8 @@
             $action =~ s/\^(.+)\$/$1/;
             $action =~ s/\\//g;
             $hier = $ctlline[2] if $type eq 'checkgroups';
+            # @ctllist is a reversed list so the first match is the last
+            # one in control.ctl.
             last;
         }
     }