Fix 'prog.' pathname construction

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9515 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-02-23 15:48:37 +00:00
parent dfca0da0f0
commit 4e99718744

View File

@ -90,9 +90,9 @@ sub generate_script_1() {
} else { } else {
emit "#!/bin/sh\n#\n# Compiled firewall script generated by Shorewall-perl $globals{VERSION} - $date\n#"; emit "#!/bin/sh\n#\n# Compiled firewall script generated by Shorewall-perl $globals{VERSION} - $date\n#";
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
copy $globals{SHAREDIR} . 'prog.header'; copy $globals{SHAREDIR} . '/prog.header';
} else { } else {
copy $globals{SHAREDIR} . 'prog.header6'; copy $globals{SHAREDIR} . '/prog.header6';
} }
} }
@ -786,9 +786,9 @@ EOF
unless ( $test ) { unless ( $test ) {
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
copy $globals{SHAREDIR} . 'prog.footer'; copy $globals{SHAREDIR} . '/prog.footer';
} else { } else {
copy $globals{SHAREDIR} . 'prog.footer6'; copy $globals{SHAREDIR} . '/prog.footer6';
} }
} }
} }
@ -940,9 +940,9 @@ sub compiler {
unless ( $command eq 'check' ) { unless ( $command eq 'check' ) {
unless ( $test ) { unless ( $test ) {
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
copy $globals{SHAREDIR} . 'prog.functions'; copy $globals{SHAREDIR} . '/prog.functions';
} else { } else {
copy $globals{SHAREDIR} . 'prog.functions6'; copy $globals{SHAREDIR} . '/prog.functions6';
} }
} }