From 27ededd8234e4856d708d6bd37020f6c1cb38f37 Mon Sep 17 00:00:00 2001
From: Maurilio Longo <maurilio.longo@libero.it>
Date: Sun, 16 Apr 2000 13:28:26 +0000
Subject: [PATCH] 20000416-15:23 GMT+2 Maurilio Longo
 <maurilio.longo@libero.it>

---
 harbour/ChangeLog                | 9 +++++++++
 harbour/config/os2/gcc.cf        | 6 ++----
 harbour/config/os2/install.cf    | 2 +-
 harbour/source/rtl/gtos2/gtos2.c | 6 +++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1f0f31c2b5..c049a51894 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+20000416-15:23 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
+
+      * config/os2/gcc.cf
+        ! fixed an error in ar rule ;-)
+      * config/os2/install.cf
+        % changed install rule to test existance of install dir
+      * source/rtl/gtos2/gtos2.c
+        % little typo fixed
+
 20000416-14:19 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
 
    * config/os2/gcc.cf
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index 7680d3bc44..e46e32d5fb 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -63,11 +63,9 @@ echo END >> __lib__.tmp
 $(AR) -M < __lib__.tmp
 endef
 
-# Under OS/2 || isn't a command separator (inside a shell, that is)
-# correct separator is & and del command can delete more than one file
-# on a single run 
+# Under OS/2 || isn't a command separator (inside a shell, that is); correct separator is & 
 AR = ar
 ARFLAGS =
-AR_RULE = $(create_library) & $(RM) $@-tmp __lib__.tmp
+AR_RULE = $(create_library) & $(RM) __lib__.tmp
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/os2/install.cf b/harbour/config/os2/install.cf
index a662736d1f..2966d51082 100644
--- a/harbour/config/os2/install.cf
+++ b/harbour/config/os2/install.cf
@@ -7,7 +7,7 @@ ifeq ($(SHLVL),) # An OS/2 command shell
 INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
 OS2_INSTALL_DIR = $(subst /,\,$(INSTALL_DIR))
 INSTALL_RULE =\
-        CMD.EXE /c FOR %f IN ($(INSTALL_LIST)) DO COPY %f $(OS2_INSTALL_DIR)
+        CMD.EXE /c FOR %f IN ($(INSTALL_LIST)) DO IF EXIST $(OS2_INSTALL_DIR). COPY %f $(OS2_INSTALL_DIR)
 
 else  # bash
 
diff --git a/harbour/source/rtl/gtos2/gtos2.c b/harbour/source/rtl/gtos2/gtos2.c
index b8d18d06ce..49e12f9d5b 100644
--- a/harbour/source/rtl/gtos2/gtos2.c
+++ b/harbour/source/rtl/gtos2/gtos2.c
@@ -107,7 +107,7 @@ void hb_gt_Init( int iFilenoStdin, int iFilenoStdout, int iFilenoStderr )
 
    /* TODO: Is anything else required to initialize the video subsystem?
             I (Maurilio Longo) think that we should set correct codepage
-            
+
       COMMENT: The correct behaviour is to inherit the codepage that is
                active when the program is started, which automatically
                happens by not setting the codepage. If somebody wants to
@@ -376,13 +376,13 @@ void hb_gt_Scroll( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight,
        *  with C++ compilers
        */
       SHORT usRow, usCol;
-      USHORT uiSize;   /* gtRectSize returns int */
+      USHORT usSize;
       int iLength = ( usRight - usLeft ) + 1;
       int iCount, iColOld, iColNew, iColSize;
 
       hb_gtGetPos( &usRow, &usCol );
 
-      if( hb_gtRectSize( usTop, usLeft, usBottom, usRight, &uiSize ) == 0 )
+      if( hb_gtRectSize( usTop, usLeft, usBottom, usRight, &usSize ) == 0 )
       {
          /* NOTE: 'unsigned' is used intentionally to correctly compile
           * with C++ compilers