From 003daec41c058418c7ea7f16438edd51925c9297 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 6 May 2012 17:30:17 -0700 Subject: [PATCH] Remove a couple of hard-coded '/usr/share' in Shorewall::Config Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 8f428ad6c..bb2844554 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -3370,7 +3370,7 @@ sub update_config_file( $ ) { # # Debian or derivative # - $fn = $annotate ? "/usr/share/doc/${product}/default-config/${product}.conf.annotated" : "/usr/share/doc/${product}/default-config/${product}.conf"; + $fn = $annotate ? "$shorewallrc{SHAREDIR}/doc/${product}/default-config/${product}.conf.annotated" : "$shorewallrc{SHAREDIR}/doc/${product}/default-config/${product}.conf"; } else { # # The rest of the World @@ -4314,7 +4314,7 @@ sub append_file( $;$$ ) { $indent = '' if $unindented; - unless ( $user_exit =~ m(^/usr/share/shorewall6?/) ) { + unless ( $user_exit =~ m(^$shorewallrc{SHAREDIR}/shorewall6?/) ) { if ( -f $user_exit ) { if ( $nomsg ) { #