diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh index 933de2ed2..6e12a3397 100755 --- a/Shorewall-core/install.sh +++ b/Shorewall-core/install.sh @@ -263,6 +263,15 @@ for f in lib.* ; do install_file $f ${DESTDIR}/usr/share/shorewall/$f 0644 echo "Library ${f#*.} file installed as ${DESTDIR}/usr/share/shorewall/$f" done + +if [ -z "$MACHOST" ]; then + eval sed -i \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/usr/share/shorewall/lib.cli + eval sed -i \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/usr/share/shorewall/lib.cli +else + eval sed -i \'\' -e \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/usr/share/shorewall/lib.cli + eval sed -i \'\' -e \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/usr/share/shorewall/lib.cli +fi + # # Symbolically link 'functions' to lib.base # diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index b82db7e3a..796b7929c 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -238,8 +238,6 @@ delete_file ${DESTDIR}/usr/share/$PRODUCT/xmodules install_file $PRODUCT ${DESTDIR}/sbin/$PRODUCT 0544 -eval sed -i \'``s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/sbin/$PRODUCT - echo "$Product control program installed in ${DESTDIR}/sbin/$PRODUCT" # diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 6c101d690..f5506e750 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -310,18 +310,9 @@ fi if [ -z "$CYGWIN" ]; then install_file $PRODUCT ${DESTDIR}/sbin/$PRODUCT 0755 - if [ -z "$MACHOST" ]; then - eval sed -i \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/sbin/$PRODUCT - eval sed -i \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/sbin/$PRODUCT - else - eval sed -i \'\' -e \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/sbin/$PRODUCT - eval sed -i \'\' -e \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/sbin/$PRODUCT - fi echo "$PRODUCT control program installed in ${DESTDIR}/sbin/$PRODUCT" else install_file $PRODUCT ${DESTDIR}/bin/$PRODUCT 0755 - eval sed -i \'s\|g_libexec=.\*\|g_libexec=$LIBEXEC\|\' ${DESTDIR}/bin/$PRODUCT - eval sed -i \'s\|g_perllib=.\*\|g_perllib=$PERLLIB\|\' ${DESTDIR}/bin/$PRODUCT echo "$PRODUCT control program installed in ${DESTDIR}/bin/$PRODUCT" fi