From ff92e5fb98018c7a1ffc7a9aa59e6da43b219aed Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 6 Oct 2009 16:58:20 +0000
Subject: [PATCH] 2009-10-06 18:57 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * INSTALL     - Deleted sudo from one pkg creation command.

  * config/global.mk
    + Added MSVS 10.0 compiler version autodetection.

  * config/os2/gcc.mk
    % Deleted OS/2 make bug workarounds from OMF specific code.
      Submitted by David Arturo Macias Corona.
      Please test/review.
---
 harbour/ChangeLog         | 12 ++++++++++++
 harbour/INSTALL           |  2 +-
 harbour/config/global.mk  |  2 ++
 harbour/config/os2/gcc.mk | 23 +++++++++++++++--------
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3191512987..df83152551 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-06 18:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    - Deleted sudo from one pkg creation command.
+
+  * config/global.mk
+    + Added MSVS 10.0 compiler version autodetection.
+
+  * config/os2/gcc.mk
+    % Deleted OS/2 make bug workarounds from OMF specific code.
+      Submitted by David Arturo Macias Corona.
+      Please test/review.
+
 2009-10-06 18:34 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/harbour.spec
     ! fixed to build with postinst.prg executed by shared linked hbrun
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 73d18d6f09..70a7bf2b30 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -210,7 +210,7 @@ HARBOUR
    Binary .tgz on *nixes
    ---------------------
 
-      $ sudo ./mpkg_tgz.sh
+      $ ./mpkg_tgz.sh
 
    Binary .deb on Linux
    --------------------
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 036abbec01..1e72f531d1 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -756,6 +756,8 @@ ifeq ($(HB_COMPILER),)
                                                       HB_COMPILER_VER := 800
                                                    else ifneq ($(findstring 9.0,$(HB_COMP_PATH)),)
                                                       HB_COMPILER_VER := 900
+                                                   else ifneq ($(findstring 10.0,$(HB_COMP_PATH)),)
+                                                      HB_COMPILER_VER := 1000
                                                    endif
                                                 else
                                                    HB_COMP_PATH := $(call find_in_path,bcc32)
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index 32d1d0c9cd..9d78b51b17 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -69,19 +69,26 @@ LDLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
 
 LDFLAGS += $(LIBPATHS)
 
-# NOTE: The empty line directly before 'endef' HAS TO exist!
-#       It causes that every command will be separated by LF
-define lib_object
-   @$(ECHO) $(ECHOQUOTE)ADDMOD $(file)$(ECHOQUOTE) >> __lib__.tmp
-
-endef
-
 ifeq ($(HB_COMPILER),gccomf)
+   # NOTE: The empty line directly before 'endef' HAS TO exist!
+   #       It causes that every command will be separated by LF
+   define lib_object
+      $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -p128 r $(LIB_DIR)/$@ $(file)$(ECHOQUOTE)
+  
+   endef
+  
    define create_library
       $(if $(wildcard $(subst /,$(DIRSEP),$(LIB_FILE))),@$(RM) $(subst /,$(DIRSEP),$(LIB_FILE)),)
-      for %i in ( *$(OBJ_EXT) ) do $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -p128 r $(LIB_DIR)/$@ %i$(ECHOQUOTE)
+      $(foreach file,$^,$(lib_object))
    endef
 else
+   # NOTE: The empty line directly before 'endef' HAS TO exist!
+   #       It causes that every command will be separated by LF
+   define lib_object
+      @$(ECHO) $(ECHOQUOTE)ADDMOD $(file)$(ECHOQUOTE) >> __lib__.tmp
+   
+   endef
+
    # We have to use a script to overcome the AR limit of max 850 characters
    # in commmand line
    define create_library