From 8497bab9737f3f6aee4e9dba1abe6c887bf74c03 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 27 Sep 2008 07:19:20 +0000
Subject: [PATCH] 2008-09-27 09:17 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)   * make_gcc.sh     % Minor cleanup after prev changes.

---
 harbour/ChangeLog   |  4 ++++
 harbour/make_gcc.sh | 28 ++++++++--------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d8edccfc6c..8175b31e36 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-09-27 09:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * make_gcc.sh
+    % Minor cleanup after prev changes.
+
 2008-09-27 09:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * include/hbthread.h
     % Disabled HB_USE_TLS for __BORLAND__ and __MINGW32__ for 
diff --git a/harbour/make_gcc.sh b/harbour/make_gcc.sh
index b4a24b870d..bca36a3810 100755
--- a/harbour/make_gcc.sh
+++ b/harbour/make_gcc.sh
@@ -69,39 +69,27 @@ OS_LIBS="-lm"
 GT_LIST="TRM"
 
 case "$HB_ARCHITECTURE" in
-   w32)  HB_OS="WIN_32"
-         GT_LIST="WIN WVT GUI"
+   w32)  GT_LIST="WIN WVT GUI"
          OS_LIBS="-luser32 -lwinspool -lwsock32 -lgdi32"
          ;;
-   cyg)  HB_OS="CYGWIN"
-         GT_LIST="${GT_LIST} WIN WVT GUI"
+   cyg)  GT_LIST="${GT_LIST} WIN WVT GUI"
          OS_LIBS="-luser32 -lwinspool -lwsock32 -lgdi32"
          ;;
-   dos)  HB_OS="DOS"
-         GT_LIST="DOS"
+   dos)  GT_LIST="DOS"
          ;;
-   os2)  HB_OS="OS2"
-         GT_LIST="${GT_LIST} OS2"
+   os2)  GT_LIST="${GT_LIST} OS2"
          ;;
-   linux) HB_OS="LINUX"
+   linux) OS_LIBS="$OS_LIBS -ldl"
          [ -d "/usr/lib/lib64" ] && [ "${HB_ARCH64}" = yes ] && HB_LIBDIRNAME="lib64"
-         OS_LIBS="$OS_LIBS -ldl"
          ;;
-   bsd)  HB_OS="BSD"
-         MAKE="gmake"
+   bsd)  MAKE="gmake"
          ;;
-   darwin) HB_OS="DARWIN"
-         ;;
-   sunos) HB_OS="SUNOS"
-         OS_LIBS="$OS_LIBS -lrt"
+   sunos) OS_LIBS="$OS_LIBS -lrt"
          CRSLIB="curses"
          ;;
-   hpux) HB_OS="HPUX"
-         MAKE="gmake"
+   hpux) MAKE="gmake"
          OS_LIBS="$OS_LIBS -lrt"
          ;;
-   *)    HB_OS=`echo $HB_ARCHITECTURE | tr '[a-z]' '[A-Z]'`
-         ;;
 esac
 
 #GTSLN=""