From ae96ef6400dc765eca9e70c7f2efa3ca34e6f667 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 19 Sep 2009 19:34:24 +0000 Subject: [PATCH] 2009-09-19 21:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * bin/postinst.sh * config/global.mk ! Fixes to prev after testing. (please review anyway) --- harbour/ChangeLog | 5 +++++ harbour/bin/postinst.sh | 18 +++--------------- harbour/config/global.mk | 1 + 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0a23c82ac5..abceb25492 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-19 21:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * bin/postinst.sh + * config/global.mk + ! Fixes to prev after testing. (please review anyway) + 2009-09-19 20:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * examples/hbdoc2/hbdoc2.prg * Minor changes/fixes to help screen and header. diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh index 55a35dfe83..07691d3a4f 100755 --- a/harbour/bin/postinst.sh +++ b/harbour/bin/postinst.sh @@ -41,24 +41,12 @@ fi . ${hb_root}/bin/hb-func.sh # Keep the size of the binaries to a minimim. -if [ -f $HB_BIN_INSTALL/harbour${hb_exesuf} ]; then - ${HB_CCPREFIX}strip $HB_BIN_INSTALL/harbour${hb_exesuf} +if [ -f $HB_BIN_INSTALL/harbour${HB_HOST_BIN_EXT} ]; then + ${HB_CCPREFIX}strip ${HB_BIN_INSTALL}/harbour${HB_HOST_BIN_EXT} fi if [ "$HB_PLATFORM" != "hpux" ]; then # Keep the size of the libraries to a minimim, but don't try to strip symlinks. - ${HB_CCPREFIX}strip -S `find $HB_LIB_INSTALL -type f` -fi - -# check if we should rebuild tools with shared libs -if [ "${HB_SYSLOC}" = yes ] -then - for utl in hbmk2 hbrun hbi18n hbformat hbtest - do - (cd "utils/${utl}" - rm -fR "./${HB_PLATFORM}/${HB_COMPILER}/${utl}${hb_exesuf}" - $MAKE install HB_BUILD_SHARED=yes - ${HB_CCPREFIX}strip "${HB_BIN_INSTALL}/${utl}${hb_exesuf}") - done + ${HB_CCPREFIX}strip -S ${HB_LIB_INSTALL}/* fi chmod 644 $HB_INC_INSTALL/* diff --git a/harbour/config/global.mk b/harbour/config/global.mk index e2aa65215e..d3acbbe36a 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -1361,6 +1361,7 @@ CXX := export HB_HOST_PLAT export HB_HOST_CPU export HB_HOST_BIN_DIR +export HB_HOST_BIN_EXT # clear these options for an unambiguous Harbour environment export HARBOUR :=