From 98f4a1c545f6c2f0d1e36b58f5ac3cec11a0fff6 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Fri, 30 Mar 2012 15:30:04 -0700
Subject: [PATCH] Replace lib.base with symbolic link

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-lite/install.sh | 12 ++++--------
 Shorewall/install.sh      | 14 +++++++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index a4b901763..b5ee045af 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -389,16 +389,12 @@ install_file configpath ${DESTDIR}${SHAREDIR}/$PRODUCT/configpath 0644
 echo "Default config path file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/configpath"
 
 #
-# Install the libraries
+# Install the library symlinks
 #
-for f in lib.* ; do
-    if [ -f $f ]; then
-	install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 0644
-	echo "Library ${f#*.} file installed as ${DESTDIR}/${SHAREDIR}/$PRODUCT/$f"
-    fi
-done
 
-ln -sf lib.base ${DESTDIR}${SHAREDIR}/$PRODUCT/functions
+for f in functions lib.base; do
+    ln -sf ../shorewall/lib.base ${DESTDIR}${SHAREDIR}/$PRODUCT/$f
+done
 
 echo "Common functions linked through ${DESTDIR}${SHAREDIR}/$PRODUCT/functions"
 
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 10cdb0ad7..2b2b96b22 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -978,11 +978,15 @@ cd ..
 #
 # Install the libraries
 #
-for f in lib.* ; do
-    if [ -f $f ]; then
-	install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 0644
-	echo "Library ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/$f"
-    fi
+if [ $PRODUCT = shorewall ]; then
+    for f in lib.* ; do
+	if [ -f $f ]; then
+	    install_file $f ${DESTDIR}${SHAREDIR}/shorewall/$f 0644
+	    echo "Library ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/shorewall/$f"
+	fi
+    done
+else
+    ln -sf ../shorewall/lib.base ${DESTDIR}${SHAREDIR}/lib.base
 done
 
 if [ $PRODUCT = shorewall6 ]; then