From 25e7555e803fa25f53e3207bf306b71de7639826 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 25 Mar 2012 12:36:25 -0700
Subject: [PATCH] Correct typo in the compiler

---
 Shorewall-core/shorewallrc.suse      | 2 +-
 Shorewall/Perl/Shorewall/Compiler.pm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Shorewall-core/shorewallrc.suse b/Shorewall-core/shorewallrc.suse
index 7b389bf41..89d29c242 100644
--- a/Shorewall-core/shorewallrc.suse
+++ b/Shorewall-core/shorewallrc.suse
@@ -4,10 +4,10 @@
 BUILD=                                  #Default is to detect the build system
 HOST=suse
 USR=/usr
+CONFDIR=/etc
 SHAREDIR=${USR}/share
 LIBEXECDIR=${USR}/libexec
 PERLLIBDIR=${USR}/share/shorewall
-CONFDIR=/etc
 SBINDIR=/sbin
 MANDIR=${SHAREDIR}/man/
 INITDIR=/etc/init.d
diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm
index 84bb7aac1..b94b707eb 100644
--- a/Shorewall/Perl/Shorewall/Compiler.pm
+++ b/Shorewall/Perl/Shorewall/Compiler.pm
@@ -160,7 +160,7 @@ sub generate_script_2() {
 	emit( 'g_family=4' );
 
 	if ( $export ) {
-	    emit ( 'SHAREDIR=$SHARDIR/shorewall-lite',
+	    emit ( 'SHAREDIR=$SHAREDIR/shorewall-lite',
 		   'CONFDIR=$CONFDIR/shorewall-lite',
 		   'VARDIR=$VARDIR/shorewall-lite',
 		   'g_product="Shorewall Lite"',
@@ -168,7 +168,7 @@ sub generate_script_2() {
 		   'g_basedir=/usr/share/shorewall-lite',
 		 );
 	} else {
-	    emit ( 'SHAREDIR=$SHARDIR/shorewall',
+	    emit ( 'SHAREDIR=$SHAREDIR/shorewall',
 		   'CONFDIR=$CONFDIR/shorewall',
 		   'VARDIR=$VARDIR/shorewall',
 		   'g_product=Shorewall',
@@ -180,7 +180,7 @@ sub generate_script_2() {
 	emit( 'g_family=6' );
 
 	if ( $export ) {
-	    emit ( 'SHAREDIR=/$SHARDIR/shorewall6-lite',
+	    emit ( 'SHAREDIR=/$SHAREDIR/shorewall6-lite',
 		   'CONFDIR=$CONFDIR/shorewall6-lite',
 		   'VARDIR=$VARDIR/shorewall6-lite',
 		   'g_product="Shorewall6 Lite"',