From 0a96f4ec34e31443a2f1b4bbca79f81a0ce2b551 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 17 Mar 2009 12:41:13 +0000 Subject: [PATCH] 2009-03-17 13:40 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * harbour-win-spec * harbour-wce-spec * make_gnu_xmingw.sh * make_gnu_xmingwce.sh * mpkg_rpm_win.sh * mpkg_tgz.sh * bin/hb-mkdyn.sh * bin/hb-func.sh * bin/postinst.sh * config/win/mingwce.cf * config/win/mingw.cf * CCPATH -> HB_CCPATH * CCPREFIX -> HB_CCPREFIX --- harbour/ChangeLog | 15 +++++++++++++++ harbour/bin/hb-func.sh | 12 ++++++------ harbour/bin/hb-mkdyn.sh | 10 +++++----- harbour/bin/postinst.sh | 8 ++++---- harbour/config/win/mingw.cf | 8 ++++---- harbour/config/win/mingwce.cf | 8 ++++---- harbour/harbour-wce-spec | 14 +++++++------- harbour/harbour-win-spec | 14 +++++++------- harbour/make_gnu_xmingw.sh | 26 +++++++++++++------------- harbour/make_gnu_xmingwce.sh | 20 ++++++++++---------- harbour/mpkg_rpm_win.sh | 8 ++++---- harbour/mpkg_tgz.sh | 8 ++++---- 12 files changed, 83 insertions(+), 68 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 26806d0cc1..df2a65f133 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,21 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-17 13:40 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * harbour-win-spec + * harbour-wce-spec + * make_gnu_xmingw.sh + * make_gnu_xmingwce.sh + * mpkg_rpm_win.sh + * mpkg_tgz.sh + * bin/hb-mkdyn.sh + * bin/hb-func.sh + * bin/postinst.sh + * config/win/mingwce.cf + * config/win/mingw.cf + * CCPATH -> HB_CCPATH + * CCPREFIX -> HB_CCPREFIX + 2009-03-17 12:22 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + tests/server.prg * tests/Makefile diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index 89acb8b1a4..7c5312d4d5 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -273,7 +273,7 @@ export HB_COMPILER="${HB_COMPILER}" [ -z "\${HB_LIB_INSTALL}" ] && export HB_LIB_INSTALL="${_DEFAULT_LIB_DIR}" # be sure that ${name} binaries are in your path -export PATH="\${HB_BIN_INSTALL}${hb_path_separator}${CCPATH}\${PATH}" +export PATH="\${HB_BIN_INSTALL}${hb_path_separator}${HB_CCPATH}\${PATH}" if [ "\${HB_COMPILER}" == "gpp" ]; then HB_CC="g++" @@ -614,7 +614,7 @@ hb_cc() n=\$[\$n + 1] done - ${CCPREFIX}\${HB_CC} "\$@" \${CC_OPT} \${GCC_PATHS} \${LNK_OPT} + ${HB_CCPREFIX}\${HB_CC} "\$@" \${CC_OPT} \${GCC_PATHS} \${LNK_OPT} } hb_cmp() @@ -674,8 +674,8 @@ hb_lnk_request() hb_lnk_main() { - (${CCPREFIX}nm \$1 -g -n --defined-only -C|sed -e '/ HB_FUN_/ ! d' -e 's/^[0-9a-fA-F]* T HB_FUN_\([A-Z0-9_]*\).*/\1/'|head -1|grep -v '^MAIN\$')2>/dev/null -# (${CCPREFIX}nm \$1 -n --defined-only|sed -e '/HB_FUN_/ ! d' -e 's/^[0-9a-fA-F]* [Tt] HB_FUN_//'|head -1|grep -v '^MAIN\$')2>/dev/null + (${HB_CCPREFIX}nm \$1 -g -n --defined-only -C|sed -e '/ HB_FUN_/ ! d' -e 's/^[0-9a-fA-F]* T HB_FUN_\([A-Z0-9_]*\).*/\1/'|head -1|grep -v '^MAIN\$')2>/dev/null +# (${HB_CCPREFIX}nm \$1 -n --defined-only|sed -e '/HB_FUN_/ ! d' -e 's/^[0-9a-fA-F]* [Tt] HB_FUN_//'|head -1|grep -v '^MAIN\$')2>/dev/null } hb_cleanup() @@ -694,12 +694,12 @@ case "\${HB}" in ;; *lnk) hb_link "\${P[@]}" && \\ - ( [ "\${HB_STRIP}" != "yes" ] || ${CCPREFIX}strip "\${FOUTE}" ) + ( [ "\${HB_STRIP}" != "yes" ] || ${HB_CCPREFIX}strip "\${FOUTE}" ) ;; *mk) hb_cmp "\${P[@]}" && \\ hb_link "\${FOUTO}" && \\ - ( [ "\${HB_STRIP}" != "yes" ] || ${CCPREFIX}strip "\${FOUTE}" ) && \\ + ( [ "\${HB_STRIP}" != "yes" ] || ${HB_CCPREFIX}strip "\${FOUTE}" ) && \\ rm -f "\${FOUTO}" ;; esac diff --git a/harbour/bin/hb-mkdyn.sh b/harbour/bin/hb-mkdyn.sh index 21534829a5..f9f8befaae 100755 --- a/harbour/bin/hb-mkdyn.sh +++ b/harbour/bin/hb-mkdyn.sh @@ -13,7 +13,7 @@ # --------------------------------------------------------------- # HB_ARCHITECTURE="" -# CCPREFIX="" +# HB_CCPREFIX="" if [ -n "${HB_ARCHITECTURE}" ] then @@ -110,7 +110,7 @@ if [ "${SLIB_EXT}" != ".dylib" ]; then d="${f##*/}" mkdir $d cd $d - ${CCPREFIX}ar -x "${f}" || exit 1 + ${HB_CCPREFIX}ar -x "${f}" || exit 1 cd .. ;; *) @@ -124,7 +124,7 @@ fi if [ "${SLIB_EXT}" = ".dylib" ]; then FULLNAME="${BASE}.${VERSION}${SLIB_EXT}" - ${CCPREFIX}libtool -dynamic -install_name "${BASE}${SLIB_EXT}" \ + ${HB_CCPREFIX}libtool -dynamic -install_name "${BASE}${SLIB_EXT}" \ -compatibility_version ${MAJOR}.${MINOR} -current_version ${VERSION} \ -flat_namespace -undefined warning -multiply_defined suppress -single_module \ -o "${DSTDIR}/${FULLNAME}" "$@" && \ @@ -138,7 +138,7 @@ elif [ "${SLIB_EXT}" = ".dll" ]; then SYSLIBS="-luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32" SYSLIBS="${SYSLIBS} -loleaut32 -luuid -lmpr -lwsock32 -lws2_32 -lmapi32" fi - ${CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_LDFLAGS} ${SYSLIBS} ${HB_DLLIBS} && \ + ${HB_CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_LDFLAGS} ${SYSLIBS} ${HB_DLLIBS} && \ cd "${dir}" && \ rm -f "${DSTDIR}${FULLNAME}" && \ mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}" @@ -146,7 +146,7 @@ else #FULLNAME="${BASE}-${VERSION}${SLIB_EXT}" #FULLNAME="${BASE}{SLIB_EXT}.${VERSION}" FULLNAME="${LIB_NAME}${SLIB_EXT}" - ${CCPREFIX}gcc -shared -fPIC -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_LDFLAGS} && \ + ${HB_CCPREFIX}gcc -shared -fPIC -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_LDFLAGS} && \ cd "${dir}" && \ mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}" fi diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh index d1b7537d08..cdaff4064c 100755 --- a/harbour/bin/postinst.sh +++ b/harbour/bin/postinst.sh @@ -47,7 +47,7 @@ if [ "$HB_COMPILER" = "gcc" ] || [ "$HB_COMPILER" = "gpp" ] || \ then RANLIB="" MAKE=make - AR="${CCPREFIX}ar -cr" + AR="${HB_CCPREFIX}ar -cr" AR_OPT="" if [ "${HB_ARCHITECTURE}" = "bsd" ] || \ [ "${HB_ARCHITECTURE}" = "hpux" ] || \ @@ -55,16 +55,16 @@ then MAKE=gmake elif [ "${HB_ARCHITECTURE}" = "darwin" ]; then # We must build an archive index on Darwin - #AR="${CCPREFIX}ar -crs" + #AR="${HB_CCPREFIX}ar -crs" AR="libtool" - AR_OPT="-static ${HB_USER_LIBTOOL} -o " + AR_OPT="-static ${HB_USER_AFLAGS} -o " fi if [ -n "${HB_TOOLS_PREF}" ]; then hb_mkdyn="${HB_BIN_INSTALL}/${HB_TOOLS_PREF}-mkdyn" rm -f "${hb_mkdyn}" sed -e "s/^# HB_ARCHITECTURE=\"\"\$/HB_ARCHITECTURE=\"${HB_ARCHITECTURE}\"/g" \ - -e "s/^# CCPREFIX=\"\"\$/[ -n \"\${CCPREFIX}\" ] || CCPREFIX=\"${CCPREFIX}\"/g" \ + -e "s/^# HB_CCPREFIX=\"\"\$/[ -n \"\${HB_CCPREFIX}\" ] || HB_CCPREFIX=\"${HB_CCPREFIX}\"/g" \ "${hb_root}/bin/hb-mkdyn.sh" > "${hb_mkdyn}" && \ chmod 755 "${hb_mkdyn}" elif [ "$HB_COMPILER" = "icc" ]; then diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf index 2b56d5b7c5..79e175784c 100644 --- a/harbour/config/win/mingw.cf +++ b/harbour/config/win/mingw.cf @@ -9,7 +9,7 @@ EXE_EXT = .exe LIB_PREF = lib LIB_EXT = .a -CC = $(CCPREFIX)gcc +CC = $(HB_CCPREFIX)gcc CC_IN = -c CC_OUT = -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -24,7 +24,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(CCPREFIX)gcc +LD = $(HB_CCPREFIX)gcc LD_OUT = -o LINKPATHS = LDLIBS = @@ -130,10 +130,10 @@ echo. ) >> __link__.tmp -$(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$@ __link__.tmp endef -AR = $(CCPREFIX)ar +AR = $(HB_CCPREFIX)ar ARFLAGS = $(HB_USER_AFLAGS) -RANLIB = $(CCPREFIX)ranlib +RANLIB = $(HB_CCPREFIX)ranlib ifeq ($(SHLVL),) # COMMAND.COM - length of command line is limited ifneq ($(OS),Windows_NT) diff --git a/harbour/config/win/mingwce.cf b/harbour/config/win/mingwce.cf index d76b2eed8d..6173dd0bc3 100644 --- a/harbour/config/win/mingwce.cf +++ b/harbour/config/win/mingwce.cf @@ -12,7 +12,7 @@ LIB_EXT = .a # Favor size for CE builds. HB_GCMODE=0 -CC = $(CCPREFIX)gcc +CC = $(HB_CCPREFIX)gcc CC_IN = -c CC_OUT = -o CPPFLAGS = -I. -I$(HB_INC_COMPILE) @@ -27,7 +27,7 @@ ifeq ($(HB_BUILD_DEBUG),yes) CFLAGS += -g endif -LD = $(CCPREFIX)gcc +LD = $(HB_CCPREFIX)gcc LD_OUT = -o LINKPATHS = LDLIBS = @@ -126,10 +126,10 @@ endef LDFLAGS = -AR = $(CCPREFIX)ar +AR = $(HB_CCPREFIX)ar ARFLAGS = $(HB_USER_AFLAGS) -RANLIB = $(CCPREFIX)ranlib +RANLIB = $(HB_CCPREFIX)ranlib ifeq ($(SHLVL),) # COMMAND.COM - length of command line is limited ifneq ($(OS),Windows_NT) diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec index 595139ed69..c86c33d1aa 100644 --- a/harbour/harbour-wce-spec +++ b/harbour/harbour-wce-spec @@ -107,9 +107,9 @@ export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -D__PLATFORM__WINCE -undef:__P export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS" export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" -export CCPATH="%{hb_ccpath}:" -export CCPREFIX="%{hb_ccpref}" -export PATH="$CCPATH$PATH" +export HB_CCPATH="%{hb_ccpath}:" +export HB_CCPREFIX="%{hb_ccpref}" +export PATH="$HB_CCPATH$PATH" export HB_XBUILD=wce export HB_BIN_INSTALL=%{_bindir} @@ -133,9 +133,9 @@ export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -D__PLATFORM__WINCE -undef:__P export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS" export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" -export CCPATH="%{hb_ccpath}:" -export CCPREFIX="%{hb_ccpref}" -export PATH="$CCPATH$PATH" +export HB_CCPATH="%{hb_ccpath}:" +export HB_CCPREFIX="%{hb_ccpref}" +export PATH="$HB_CCPATH$PATH" export HB_HOST_BUILD=lib export HB_ARCHITECTURE=win @@ -166,7 +166,7 @@ make -i install [ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a # Keep the size of the libraries to a minimim. -${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/* +${HB_CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/* # remove unused files rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec index 6230bb4bf9..ca7fb2b426 100644 --- a/harbour/harbour-win-spec +++ b/harbour/harbour-win-spec @@ -107,9 +107,9 @@ export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS" export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" -export CCPATH="%{hb_ccpath}:" -export CCPREFIX="%{hb_ccpref}" -export PATH="$CCPATH$PATH" +export HB_CCPATH="%{hb_ccpath}:" +export HB_CCPREFIX="%{hb_ccpref}" +export PATH="$HB_CCPATH$PATH" export HB_XBUILD=win export HB_BIN_INSTALL=%{_bindir} @@ -133,9 +133,9 @@ export CC_HB_USER_PRGFLAGS="-D__PLATFORM__WINDOWS -undef:__PLATFORM__UNIX -undef export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS" export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS}" -export CCPATH="%{hb_ccpath}:" -export CCPREFIX="%{hb_ccpref}" -export PATH="$CCPATH$PATH" +export HB_CCPATH="%{hb_ccpath}:" +export HB_CCPREFIX="%{hb_ccpref}" +export PATH="$HB_CCPATH$PATH" export HB_HOST_BUILD=lib export HB_ARCHITECTURE=win @@ -166,7 +166,7 @@ make -i install [ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a # Keep the size of the libraries to a minimim. -${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/* +${HB_CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/* # remove unused files rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe diff --git a/harbour/make_gnu_xmingw.sh b/harbour/make_gnu_xmingw.sh index 1e4641bf9e..e2b7f36585 100755 --- a/harbour/make_gnu_xmingw.sh +++ b/harbour/make_gnu_xmingw.sh @@ -50,7 +50,7 @@ export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS $HB_USER_PRGFLAGS" if [ -f /etc/debian_version ]; then MINGW_PREFIX=/usr TARGET=i586-mingw32msvc - CCPREFIX="$TARGET-" + HB_CCPREFIX="$TARGET-" elif [ -f /etc/gentoo-release ]; then if [ -x /opt/xmingw/bin/i386-mingw32-gcc ]; then MINGW_PREFIX=/opt/xmingw @@ -59,21 +59,21 @@ elif [ -f /etc/gentoo-release ]; then MINGW_PREFIX=/usr TARGET=i686-mingw32 fi - CCPREFIX="$TARGET-" + HB_CCPREFIX="$TARGET-" elif [ "$UNAME" = "FreeBSD" ]; then MINGW_PREFIX=/usr/local/mingw32 TARGET="." - CCPREFIX="" + HB_CCPREFIX="" UNAMEL=bsd elif [ -x /usr/local/bin/i[3456]86-mingw*-gcc ]; then MINGW_PREFIX=/usr/local TARGET=`echo /usr/local/bin/i[3456]86-mingw*-gcc|sed -e '1 !d' -e 's/.*\(i[3456]86-mingw[^-]*\).*/\1/g'` - CCPREFIX="$TARGET-" + HB_CCPREFIX="$TARGET-" fi if [ -z "${MINGW_PREFIX}" ] || \ - ( [ ! -x ${MINGW_PREFIX}/bin/${CCPREFIX}gcc ] && \ - [ ! -x ${MINGW_PREFIX}/${TARGET}/bin/${CCPREFIX}gcc ] ); then + ( [ ! -x ${MINGW_PREFIX}/bin/${HB_CCPREFIX}gcc ] && \ + [ ! -x ${MINGW_PREFIX}/${TARGET}/bin/${HB_CCPREFIX}gcc ] ); then # MinGW cross-compiler not found in default location # scan some usually used locations and names for d in /usr /usr/local /usr/local/mingw32 /opt/xmingw; do @@ -82,30 +82,30 @@ if [ -z "${MINGW_PREFIX}" ] || \ if [ -x $MINGWGCC ]; then MINGW_PREFIX=$d TARGET=`echo "$MINGWGCC"|sed -e '1 !d' -e 's/.*\(i[3456]86-mingw[^-]*\).*/\1/g'` - CCPREFIX="$TARGET-" + HB_CCPREFIX="$TARGET-" else MINGWGCC=`echo $d/i[3456]86-mingw*/bin/gcc` if [ -x $MINGWGCC ]; then MINGW_PREFIX=$d TARGET=`echo "$MINGWGCC"|sed -e '1 !d' -e 's!.*\(i[3456]86-mingw[^/]*\).*!\1!g'` - CCPREFIX="" + HB_CCPREFIX="" fi fi fi done fi -if [ ! -x ${MINGW_PREFIX}/bin/${CCPREFIX}gcc ] && \ - [ ! -x ${MINGW_PREFIX}/${TARGET}/bin/${CCPREFIX}gcc ]; then +if [ ! -x ${MINGW_PREFIX}/bin/${HB_CCPREFIX}gcc ] && \ + [ ! -x ${MINGW_PREFIX}/${TARGET}/bin/${HB_CCPREFIX}gcc ]; then echo "Can't determine the location for the MinGW32 cross-compiler." echo "Please install it or add your platform to the $0 script." exit 1 fi -CCPATH="$MINGW_PREFIX/bin:$MINGW_PREFIX/$TARGET/bin:" -PATH="$CCPATH$PATH" +HB_CCPATH="$MINGW_PREFIX/bin:$MINGW_PREFIX/$TARGET/bin:" +PATH="$HB_CCPATH$PATH" -export PATH CCPATH CCPREFIX +export PATH HB_CCPATH HB_CCPREFIX export HB_TOOLS_PREF="hbw" export HB_XBUILD="win" diff --git a/harbour/make_gnu_xmingwce.sh b/harbour/make_gnu_xmingwce.sh index c379234e75..621c82741f 100755 --- a/harbour/make_gnu_xmingwce.sh +++ b/harbour/make_gnu_xmingwce.sh @@ -46,35 +46,35 @@ export CC_HB_USER_PRGFLAGS export HB_USER_PRGFLAGS="$CC_HB_USER_PRGFLAGS $HB_USER_PRGFLAGS" # default cegcc instalation path -[ -z "$CCPATH" ] && CCPATH="/opt/mingw32ce/bin" +[ -z "$HB_CCPATH" ] && HB_CCPATH="/opt/mingw32ce/bin" if [ "$HB_HOST_ARCH" != "win" ]; then - export PATH="$CCPATH:$PATH" + export PATH="$HB_CCPATH:$PATH" fi # cegcc executables prefix - this # has changed in cegcc/gcc4.3.0 -if [ -z "$CCPREFIX" ]; then - if [ -x "${CCPATH}/arm-wince-mingw32ce-gcc" ]; then - export CCPREFIX="arm-wince-mingw32ce-" +if [ -z "$HB_CCPREFIX" ]; then + if [ -x "${HB_CCPATH}/arm-wince-mingw32ce-gcc" ]; then + export HB_CCPREFIX="arm-wince-mingw32ce-" else - if [ -x "${CCPATH}/arm-mingw32ce-gcc" ]; then - export CCPREFIX="arm-mingw32ce-" + if [ -x "${HB_CCPATH}/arm-mingw32ce-gcc" ]; then + export HB_CCPREFIX="arm-mingw32ce-" else echo "cegcc compiler executable not found. Ensure you have cegcc package installed in" - echo "/opt/mingw32ce dir, or (alternatively) set environment variable CCPATH to a cegcc" + echo "/opt/mingw32ce dir, or (alternatively) set environment variable HB_CCPATH to a cegcc" echo "installation directory" exit 1 fi fi fi -export CCPATH="${CCPATH}:" +export HB_CCPATH="${HB_CCPATH}:" export HB_TOOLS_PREF="hbce" export HB_XBUILD="wce" [ "${HB_HOST_BUILD}" = "all" ] || export HB_HOST_BUILD="lib" -export HB_BIN_COMPILE="/tmp/hb-${CCPREFIX}-$$" +export HB_BIN_COMPILE="/tmp/hb-${HB_CCPREFIX}-$$" rm -fR "${HB_BIN_COMPILE}" trap cleanup EXIT >/dev/null 2>&1 mkdir ${HB_BIN_COMPILE} diff --git a/harbour/mpkg_rpm_win.sh b/harbour/mpkg_rpm_win.sh index 2702871189..3f8a87bcb5 100755 --- a/harbour/mpkg_rpm_win.sh +++ b/harbour/mpkg_rpm_win.sh @@ -65,8 +65,8 @@ then exit 1 fi -CCPREFIX="$TARGET-" -CCPATH="$MINGW_DIR/bin" +HB_CCPREFIX="$TARGET-" +HB_CCPATH="$MINGW_DIR/bin" cd `dirname $0` @@ -130,8 +130,8 @@ then mv ${hb_filename} ${RPMDIR}/SOURCES/ sed -e "s|^%define version .*$|%define version ${hb_ver}|g" \ -e "s|^%define releasen .*$|%define releasen ${hb_verstat}|g" \ - -e "s|^%define hb_ccpath .*$|%define hb_ccpath ${CCPATH}|g" \ - -e "s|^%define hb_ccpref .*$|%define hb_ccpref ${CCPREFIX}|g" \ + -e "s|^%define hb_ccpath .*$|%define hb_ccpath ${HB_CCPATH}|g" \ + -e "s|^%define hb_ccpref .*$|%define hb_ccpref ${HB_CCPREFIX}|g" \ harbour-win-spec > ${RPMDIR}/SPECS/harbour-win.spec if which rpmbuild &>/dev/null then diff --git a/harbour/mpkg_tgz.sh b/harbour/mpkg_tgz.sh index c51610d4a6..bcb9fb19b9 100755 --- a/harbour/mpkg_tgz.sh +++ b/harbour/mpkg_tgz.sh @@ -236,11 +236,11 @@ done # Keep the size of the binaries to a minimim. if [ -f $HB_BIN_INSTALL/harbour${hb_exesuf} ]; then - ${CCPREFIX}strip $HB_BIN_INSTALL/harbour${hb_exesuf} + ${HB_CCPREFIX}strip $HB_BIN_INSTALL/harbour${hb_exesuf} fi if [ "$HB_ARCHITECTURE" != "hpux" ]; then # Keep the size of the libraries to a minimim, but don't try to strip symlinks. - ${CCPREFIX}strip -S `find $HB_LIB_INSTALL -type f` + ${HB_CCPREFIX}strip -S `find $HB_LIB_INSTALL -type f` fi if [ "${hb_sysdir}" = "yes" ]; then @@ -250,7 +250,7 @@ cp -f source/rtl/gtcrs/hb-charmap.def $HB_INST_PREF$ETC/harbour/hb-charmap.def chmod 644 $HB_INST_PREF$ETC/harbour/hb-charmap.def cat > $HB_INST_PREF$ETC/harbour.cfg <