From 6404c57cf83435acacbb8536c1477142f2794d0b Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 11 Apr 2012 08:01:49 -0700 Subject: [PATCH] Clean up configure.pl - Remove blank lines at the end - Simply the handling of vendor Signed-off-by: Tom Eastep --- Shorewall-core/configure.pl | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/Shorewall-core/configure.pl b/Shorewall-core/configure.pl index 32095eb72..5bf0dbacc 100755 --- a/Shorewall-core/configure.pl +++ b/Shorewall-core/configure.pl @@ -59,8 +59,8 @@ my $rcfilename; if ( defined $vendor ) { $rcfilename = 'shorewallrc.' . $vendor; } else { - $rcfilename = 'shorewallrc.default'; - $vendor = 'linux'; + $rcfilename = 'shorewallrc.default'; + $params{HOST} = 'linux'; } open $rcfile, '<', $rcfilename or die "Unable to open $rcfilename for input: $!"; @@ -83,10 +83,8 @@ my $outfile; open $outfile, '>', 'shorewallrc' or die "Can't open 'shorewallrc' for output: $!"; -print "HOST=$vendor\n"; -print $outfile "HOST=$vendor\n"; - -for ( qw/ PREFIX +for ( qw/ HOST + PREFIX SHAREDIR LIBEXECDIR PERLLIBDIR @@ -113,18 +111,3 @@ for ( qw/ PREFIX close $outfile; 1; - - - - - - - - - - - - - - -