From 007a9c5f8fef39ddc581f01e0f12dc4520eb2dec Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Sat, 22 Dec 2007 11:59:11 +0000
Subject: [PATCH] 2007-12-22 12:58 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/make_tgz.sh     + added HB_BUILDSUF    
 - removed hbverfix and pretest from final binaries     ! fixed setting
 UNTAR_OPT

---
 harbour/ChangeLog   |  6 ++++++
 harbour/make_tgz.sh | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8ec00b4f3d..8b84c1418b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-12-22 12:58 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/make_tgz.sh
+    + added HB_BUILDSUF
+    - removed hbverfix and pretest from final binaries
+    ! fixed setting UNTAR_OPT
+
 2007-12-22 11:59 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/make_tgz.sh
     * use -fPIC on HP-UX
diff --git a/harbour/make_tgz.sh b/harbour/make_tgz.sh
index b5a68bc2b0..d247d19b59 100755
--- a/harbour/make_tgz.sh
+++ b/harbour/make_tgz.sh
@@ -16,7 +16,7 @@ cd `dirname $0`
 name="harbour"
 hb_ver=`get_hbver`
 hb_platform=`get_hbplatform`
-[ "${hb_platform}" = "" ] || hb_platform="-${hb_platform}"
+[ "${hb_platform}" = "" ] || hb_platform="-${hb_platform}${HB_BUILDSUF}"
 [ "${HB_XBUILD}" = "" ] || hb_platform="-${HB_XBUILD}"
 hb_archfile="${name}-${hb_ver}${hb_platform}.bin.tar.gz"
 hb_instfile="${name}-${hb_ver}${hb_platform}.inst.sh"
@@ -233,6 +233,9 @@ do
      $MAKE -r -i install)
 done
 
+# remove some unnecessary binaries
+rm -f $HB_BIN_INSTALL/hbverfix${hb_exesuf} $HB_BIN_INSTALL/pretest${hb_exesuf}
+
 # 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}
@@ -284,15 +287,13 @@ fi
 chmod 644 $HB_INC_INSTALL/*
 
 CURDIR=$(pwd)
-(cd "${HB_INST_PREF}"
 if [ $hb_gnutar = yes ]; then
-    $TAR czvf "${CURDIR}/${hb_archfile}" --owner=${HB_INSTALL_OWNER} --group=${HB_INSTALL_GROUP} .
+    (cd "${HB_INST_PREF}"; $TAR czvf "${CURDIR}/${hb_archfile}" --owner=${HB_INSTALL_OWNER} --group=${HB_INSTALL_GROUP} .)
     UNTAR_OPT=xvpf
 else
-    $TAR cvf - . | gzip > "${CURDIR}/${hb_archfile}"
+    (cd "${HB_INST_PREF}"; $TAR cvf - . | gzip > "${CURDIR}/${hb_archfile}")
     UNTAR_OPT=xvf
 fi
-)
 rm -fR "${HB_INST_PREF}"
 
 if [ -n "${hb_instfile}" ]; then