diff --git a/Shorewall/Shorewall/Compiler.pm b/Shorewall/Shorewall/Compiler.pm index 65e2237da..08647017f 100644 --- a/Shorewall/Shorewall/Compiler.pm +++ b/Shorewall/Shorewall/Compiler.pm @@ -90,9 +90,9 @@ sub generate_script_1() { } else { emit "#!/bin/sh\n#\n# Compiled firewall script generated by Shorewall-perl $globals{VERSION} - $date\n#"; if ( $family == F_IPV4 ) { - copy $globals{SHAREDIR} . '/prog.header'; + copy $globals{SHAREDIRPL} . '/prog.header'; } else { - copy $globals{SHAREDIR} . '/prog.header6'; + copy $globals{SHAREDIRPL} . '/prog.header6'; } } @@ -790,9 +790,9 @@ EOF unless ( $test ) { if ( $family == F_IPV4 ) { - copy $globals{SHAREDIR} . '/prog.footer'; + copy $globals{SHAREDIRPL} . '/prog.footer'; } else { - copy $globals{SHAREDIR} . '/prog.footer6'; + copy $globals{SHAREDIRPL} . '/prog.footer6'; } } } @@ -944,9 +944,9 @@ sub compiler { unless ( $command eq 'check' ) { unless ( $test ) { if ( $family == F_IPV4 ) { - copy $globals{SHAREDIR} . '/prog.functions'; + copy $globals{SHAREDIRPL} . '/prog.functions'; } else { - copy $globals{SHAREDIR} . '/prog.functions6'; + copy $globals{SHAREDIRPL} . '/prog.functions6'; } } diff --git a/Shorewall/Shorewall/Config.pm b/Shorewall/Shorewall/Config.pm index 75f11119a..696277010 100644 --- a/Shorewall/Shorewall/Config.pm +++ b/Shorewall/Shorewall/Config.pm @@ -310,6 +310,7 @@ sub initialize( $ ) { # Misc Globals # %globals = ( SHAREDIR => '/usr/share/shorewall' , + SHAREDIRPL => '/usr/share/shorewall' , CONFDIR => '/etc/shorewall', ORIGINAL_POLICY_MATCH => '', LOGPARMS => '',