diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2aa58b8643..2b08ffb102 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2010-12-15 09:29 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/package/mpkg_rpm_win.sh + * synced MINGW cross compiler detection with global.mk + 2010-12-15 01:52 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbssl/hbssl.c ! fixed HB_SSL_READ_ALL() and HB_SSL_READ_LINE() to not call diff --git a/harbour/package/mpkg_rpm_win.sh b/harbour/package/mpkg_rpm_win.sh index 45cd144dac..9faa2762fc 100755 --- a/harbour/package/mpkg_rpm_win.sh +++ b/harbour/package/mpkg_rpm_win.sh @@ -35,13 +35,13 @@ get_rpmmacro() echo -n "${R}" } -for d in /usr /usr/local /opt/xmingw /opt/cross +for d in /usr /usr/local /usr/local/mingw32 /opt/xmingw /opt/cross do if [ -z "${TARGET}" ] then - TARGET=`find $d/bin -maxdepth 1 -name "i[3456]86-mingw*-gcc" \ + TARGET=`find $d/bin -maxdepth 1 -name "i[3456]86*-mingw*-gcc" \ 2>/dev/null | \ - sed -e '1 !d' -e 's/.*\(i[3456]86-mingw[^-]*\).*/\1/g'` + sed -e '1 !d' -e 's/.*\(i[3456]86.*-mingw[^-]*\).*/\1/g'` MINGW_DIR=$d fi done