--- scripts/logwatch.pl 2020-01-20 14:45:14.000000000 -0500 +++ scripts/logwatch.pl 2020-06-16 16:05:33.000000000 -0400 @@ -51,8 +51,8 @@ use POSIX qw(locale_h); setlocale(LC_ALL, "C"); -my $BaseDir = "/usr/share/logwatch"; -my $ConfigDir = "/etc/logwatch"; +my $BaseDir = "@PREFIX@/share/logwatch"; +my $ConfigDir = "@PREFIX@/etc/logwatch"; my $PerlVersion = "$^X"; ############################################################################# @@ -88,10 +88,10 @@ $Config{'range'} = "yesterday"; $Config{'debug'} = 0; $Config{'archives'} = 1; -$Config{'tmpdir'} = "/var/cache/logwatch"; +$Config{'tmpdir'} = "@PREFIX@/var/cache/logwatch"; $Config{'numeric'} = 0; $Config{'pathtocat'} = "cat"; -$Config{'pathtozcat'} = "zcat"; +$Config{'pathtozcat'} = "gunzip -c"; $Config{'pathtobzcat'} = "bzcat"; $Config{'pathtoxzcat'} = "xzcat"; $Config{'output'} = "stdout"; #8.0 @@ -101,7 +101,7 @@ $Config{'html_wrap'} = 80; $Config{'suppress_ignores'} = 0; $Config{'hostlimit'} = ""; -$Config{'appendvaradmtologdirs'} = 1; +$Config{'appendvaradmtologdirs'} = 0; $Config{'appendvarlogtologdirs'} = 1; $Config{'appendcwdtologdirs'} = 0; @@ -224,6 +224,7 @@ push @TempLogDirs, "/var/adm/" if $Config{'appendvaradmtologdirs'}; push @TempLogDirs, "/var/log/" if $Config{'appendvarlogtologdirs'}; +push @TempLogDirs, "@PREFIX@/var/log/" if $Config{'appendvarlogtologdirs'}; # Empty string for LogDirs entry interpreted as `cwd`, but set # explicitly here for more readable debug output push @TempLogDirs, getcwd() if $Config{'appendcwdtologdirs'};