diff -Nurd acoc-0.6.0.orig/acoc acoc-0.6.0/acoc --- acoc-0.6.0.orig/acoc Sat Oct 23 01:49:08 2004 +++ acoc-0.6.0/acoc Sun Oct 24 08:52:33 2004 @@ -1,4 +1,4 @@ -#!/usr/bin/ruby -w +#!@PREFIX@/bin/ruby1.8 -w # # acoc - Arbitrary Command Output Colourer # @@ -53,7 +53,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. = FILES -* /usr/local/etc/acoc.conf /etc/acoc.conf ~/.acoc.conf +* @PREFIX@/etc/acoc.conf ~/.acoc.conf = ENVIRONMENT : ((|$ACOCRC|)) If set, this specifies the location of an additional configuration file. @@ -114,7 +114,7 @@ @colour = "colour" end - config_files = %w(/etc/acoc.conf /usr/local/etc/acoc.conf) + config_files = %w(@PREFIX@/etc/acoc.conf) config_files << ENV['HOME'] + "/.acoc.conf" config_files << ENV['ACOCRC'] if ENV['ACOCRC'] diff -Nurd acoc-0.6.0.orig/acoc.1 acoc-0.6.0/acoc.1 --- acoc-0.6.0.orig/acoc.1 Sat Oct 23 01:52:23 2004 +++ acoc-0.6.0/acoc.1 Sun Oct 24 08:54:11 2004 @@ -44,7 +44,7 @@ .IP .B \(bu -/usr/local/etc/acoc.conf /etc/acoc.conf ~/.acoc.conf +@PREFIX@/etc/acoc.conf ~/.acoc.conf .SH ENVIRONMENT .TP .fi diff -Nurd acoc-0.6.0.orig/acoc.conf.5 acoc-0.6.0/acoc.conf.5 --- acoc-0.6.0.orig/acoc.conf.5 Sat Oct 23 01:52:23 2004 +++ acoc-0.6.0/acoc.conf.5 Sun Oct 24 09:13:10 2004 @@ -5,7 +5,7 @@ acoc.conf \- configuration file for acoc(1) .SH SYNOPSIS .PP -/etc/acoc.conf +@PREFIX@/etc/acoc.conf .SH DESCRIPTION .nf \& acoc is a regular expression based colour formatter for programs that @@ -17,8 +17,8 @@ \& acoc then applies matching rules to patterns in the output and \& applies colour sets to those matches. \& -\& The configuration files used by the program are /etc/acoc.conf, -\& /usr/local/etc/acoc.conf and ~/.acoc.conf. They are sought and read +\& The configuration files used by the program are @PREFIX@/etc/acoc.conf +\& and ~/.acoc.conf. They are sought and read \& in that order. Obviously, at least one of them should exist on the \& system. \& @@ -126,8 +126,8 @@ \& [tcpdump/r] \& \& If this were placed in ~/.acoc.conf, it would remove any matching -\& rules that had been installed for the tcpdump command by either -\& /etc/acoc.conf or /usr/local/etc/acoc.conf. +\& rules that had been installed for the tcpdump command by +\& @PREFIX@/etc/acoc.conf. \& \& After defining the program name and operational flags, matching rules \& can be defined. These take the following form: diff -Nurd acoc-0.6.0.orig/acoc.conf.html acoc-0.6.0/acoc.conf.html --- acoc-0.6.0.orig/acoc.conf.html Sat Oct 23 01:52:23 2004 +++ acoc-0.6.0/acoc.conf.html Sun Oct 24 08:58:49 2004 @@ -10,7 +10,7 @@
acoc.conf - configuration file for acoc(1)
/etc/acoc.conf
+@PREFIX@/etc/acoc.conf
acoc is a regular expression based colour formatter for programs that display output on the command-line. It works as a wrapper around the @@ -21,8 +21,8 @@ acoc then applies matching rules to patterns in the output and applies colour sets to those matches. -The configuration files used by the program are /etc/acoc.conf, -/usr/local/etc/acoc.conf and ~/.acoc.conf. They are sought and read +The configuration files used by the program are @PREFIX@/etc/acoc.conf +and ~/.acoc.conf. They are sought and read in that order. Obviously, at least one of them should exist on the system. @@ -130,8 +130,8 @@ [tcpdump/r] If this were placed in ~/.acoc.conf, it would remove any matching -rules that had been installed for the tcpdump command by either -/etc/acoc.conf or /usr/local/etc/acoc.conf. +rules that had been installed for the tcpdump command by +@PREFIX@/etc/acoc.conf. After defining the program name and operational flags, matching rules can be defined. These take the following form: diff -Nurd acoc-0.6.0.orig/acoc.conf.rd acoc-0.6.0/acoc.conf.rd --- acoc-0.6.0.orig/acoc.conf.rd Sat Oct 23 01:45:08 2004 +++ acoc-0.6.0/acoc.conf.rd Sun Oct 24 09:08:31 2004 @@ -5,7 +5,7 @@ = NAME acoc.conf - configuration file for acoc(1) = SYNOPSIS -/etc/acoc.conf +@PREFIX@/etc/acoc.conf = DESCRIPTION acoc is a regular expression based colour formatter for programs that display output on the command-line. It works as a wrapper around the @@ -16,8 +16,8 @@ acoc then applies matching rules to patterns in the output and applies colour sets to those matches. - The configuration files used by the program are /etc/acoc.conf, - /usr/local/etc/acoc.conf and ~/.acoc.conf. They are sought and read + The configuration files used by the program are @PREFIX@/etc/acoc.conf + and ~/.acoc.conf. They are sought and read in that order. Obviously, at least one of them should exist on the system. @@ -125,8 +125,8 @@ [tcpdump/r] If this were placed in ~/.acoc.conf, it would remove any matching - rules that had been installed for the tcpdump command by either - /etc/acoc.conf or /usr/local/etc/acoc.conf. + rules that had been installed for the tcpdump command by + @PREFIX@/etc/acoc.conf. After defining the program name and operational flags, matching rules can be defined. These take the following form: diff -Nurd acoc-0.6.0.orig/acoc.html acoc-0.6.0/acoc.html --- acoc-0.6.0.orig/acoc.html Sat Oct 23 01:52:23 2004 +++ acoc-0.6.0/acoc.html Sun Oct 24 09:03:18 2004 @@ -41,7 +41,7 @@ FOR A PARTICULAR PURPOSE.