diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3c7e5b0b01..2c6bd1e253 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-15 03:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * bin/postinst.sh + + Posixify by Tamas Tevesz. Thanks! + 2010-06-15 02:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * mpkg_deb.sh * mpkg_rpm.sh diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh index 9a5c104953..015b5a8317 100755 --- a/harbour/bin/postinst.sh +++ b/harbour/bin/postinst.sh @@ -81,15 +81,15 @@ mk_hblibso() linker_options="-lm" fi linker_mtoptions="" - if [ "${HB_USER_CFLAGS//-DHB_POSIX_REGEX/}" != "${HB_USER_CFLAGS}" ]; then - hb_libs="${hb_libs//hbpcre/}" + if echo ${HB_USER_CFLAGS} | grep -q -- -DHB_POSIX_REGEX ; then + hb_libs="$( echo ${hb_libs} | sed 's!hbpcre!!g' )" elif [ -z "${HB_HAS_PCRE_LOCAL}" ]; then linker_options="-lpcre ${linker_options}" - hb_libs="${hb_libs//hbpcre/}" + hb_libs="$( echo ${hb_libs} | sed 's!hbpcre!!g' )" fi if [ -z "${HB_HAS_ZLIB_LOCAL}" ]; then linker_options="-lz ${linker_options}" - hb_libs="${hb_libs//hbzlib/}" + hb_libs="$( echo ${hb_libs} | sed 's!hbzlib!!g' )" fi if [ "${HB_COMPILER}" = "mingw" ] || [ "${HB_COMPILER}" = "mingw64" ]; then linker_options="${linker_options} -luser32 -lwinspool -lgdi32 -lcomctl32 -ladvapi32 -lcomdlg32 -lole32 -loleaut32 -luuid -lws2_32"