holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Revert "Replace lib.base with symbolic link"

Browse Source 
This reverts commit 98f4a1c545.
This commit is contained in:
Tom Eastep 2012-03-31 12:57:38 -07:00
parent cf176474ac
commit 75b57b926a
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Shorewall-lite/install.sh
View File

@ -394,13 +394,17 @@ install_file configpath ${DESTDIR}${SHAREDIR}/$PRODUCT/configpath 0644
echo "Default config path file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/configpath"
#
# Install the library symlinks
# Install the libraries
#
for f in functions lib.base; do
ln -sf ../shorewall/lib.base ${DESTDIR}${SHAREDIR}/$PRODUCT/$f
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
echo "Common functions linked through ${DESTDIR}${SHAREDIR}/$PRODUCT/functions"
#

14
Shorewall/install.sh
View File

@ -978,15 +978,11 @@ cd ..
#
# Install the libraries
#
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
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
if [ $PRODUCT = shorewall6 ]; then