mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-19 08:07:13 +02:00
Revert "Replace lib.base with symbolic link"
This reverts commit 98f4a1c545f6c2f0d1e36b58f5ac3cec11a0fff6.
This commit is contained in:
parent
cf176474ac
commit
75b57b926a
@ -394,13 +394,17 @@ install_file configpath ${DESTDIR}${SHAREDIR}/$PRODUCT/configpath 0644
|
|||||||
echo "Default config path file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/configpath"
|
echo "Default config path file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/configpath"
|
||||||
|
|
||||||
#
|
#
|
||||||
# Install the library symlinks
|
# Install the libraries
|
||||||
#
|
#
|
||||||
|
for f in lib.* ; do
|
||||||
for f in functions lib.base; do
|
if [ -f $f ]; then
|
||||||
ln -sf ../shorewall/lib.base ${DESTDIR}${SHAREDIR}/$PRODUCT/$f
|
install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 0644
|
||||||
|
echo "Library ${f#*.} file installed as ${DESTDIR}/${SHAREDIR}/$PRODUCT/$f"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
ln -sf lib.base ${DESTDIR}${SHAREDIR}/$PRODUCT/functions
|
||||||
|
|
||||||
echo "Common functions linked through ${DESTDIR}${SHAREDIR}/$PRODUCT/functions"
|
echo "Common functions linked through ${DESTDIR}${SHAREDIR}/$PRODUCT/functions"
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -978,15 +978,11 @@ cd ..
|
|||||||
#
|
#
|
||||||
# Install the libraries
|
# Install the libraries
|
||||||
#
|
#
|
||||||
if [ $PRODUCT = shorewall ]; then
|
for f in lib.* ; do
|
||||||
for f in lib.* ; do
|
if [ -f $f ]; then
|
||||||
if [ -f $f ]; then
|
install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 0644
|
||||||
install_file $f ${DESTDIR}${SHAREDIR}/shorewall/$f 0644
|
echo "Library ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/$f"
|
||||||
echo "Library ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/shorewall/$f"
|
fi
|
||||||
fi
|
|
||||||
done
|
|
||||||
else
|
|
||||||
ln -sf ../shorewall/lib.base ${DESTDIR}${SHAREDIR}/lib.base
|
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ $PRODUCT = shorewall6 ]; then
|
if [ $PRODUCT = shorewall6 ]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user