From c68b5e22e393d5455c8dfb5b04a0e745fa40b505 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Thu, 7 Feb 2008 19:17:55 +0000
Subject: [PATCH] 2008-02-07 20:17 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/config/lib.cf     * moved some
 definitions for easier detecting library build mode   *
 harbour/config/os2/dir.cf   * harbour/config/os2/global.cf     * some
 modifications which should help for old GNU make OS2 ports       and maybe
 also current ones

---
 harbour/ChangeLog            |  8 ++++++++
 harbour/config/lib.cf        | 10 +++++-----
 harbour/config/os2/dir.cf    |  4 ++--
 harbour/config/os2/global.cf | 28 +++++++++++++++-------------
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a9fb2510f2..12e30e4a31 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-02-07 20:17 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/lib.cf
+    * moved some definitions for easier detecting library build mode
+  * harbour/config/os2/dir.cf
+  * harbour/config/os2/global.cf
+    * some modifications which should help for old GNU make OS2 ports
+      and maybe also current ones
+
 2008-02-07 11:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/config/os2/gcc.cf
     * use OS2_LIB_ARCH as library name to avoid problems with DEL
diff --git a/harbour/config/lib.cf b/harbour/config/lib.cf
index 942ed092de..9c2833d3a2 100644
--- a/harbour/config/lib.cf
+++ b/harbour/config/lib.cf
@@ -5,17 +5,17 @@
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
 
+#no slash at the end
+LIB_PATH := $(TOP)$(ROOT)lib/$(HB_ARCHITECTURE)
+#no slash at the end
+LIB_DIR := $(LIB_PATH)/$(HB_COMPILER)
+
 include $(TOP)$(ROOT)config/global.cf
 include $(TOP)$(ROOT)config/c.cf
 include $(TOP)$(ROOT)config/prg.cf
 
 LIB_NAME := $(LIB_PREF)$(LIBNAME)$(LIB_EXT)
 
-#no slash at the end
-LIB_PATH := $(TOP)$(ROOT)lib/$(HB_ARCHITECTURE)
-#no slash at the end
-LIB_DIR := $(LIB_PATH)/$(HB_COMPILER)
-
 LIB_ARCH := $(LIB_DIR)/$(LIB_NAME)
 
 ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
diff --git a/harbour/config/os2/dir.cf b/harbour/config/os2/dir.cf
index 6fc8a9cf72..7f54dc220a 100644
--- a/harbour/config/os2/dir.cf
+++ b/harbour/config/os2/dir.cf
@@ -10,9 +10,9 @@ ifeq ($(DIRS),) # Empty directory list
 DIR_RULE =\
 	@echo Done
 else
+DIR_MAKE = $(subst /,\,$(MK))
 DIR_LIST = $(subst /,\,$(DIRS))
-DIR_RULE =\
-	CMD.EXE /c FOR %d IN ($(DIR_LIST)) DO $(MK) -C %d $@
+DIR_RULE = CMD.EXE /C FOR %d IN ($(DIR_LIST)) DO $(DIR_MAKE) -C %d $@
 endif
 
 else  # bash
diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf
index 0ccfcd3fc9..e09e0ec0d7 100644
--- a/harbour/config/os2/global.cf
+++ b/harbour/config/os2/global.cf
@@ -42,23 +42,25 @@ CP = copy
 MV = move
 MD = md
 
-ifeq ($(OS2_LIB_PATH),)
-dirbase::
-	-FOR %d IN ($(HB_ARCHITECTURE) $(OS2_ARCH_DIR)) DO IF NOT EXIST %d $(MD) %d
-else
-dirbase::
-	-FOR %d IN ($(HB_ARCHITECTURE) $(OS2_ARCH_DIR) $(OS2_LIB_PATH) $(OS2_LIB_DIR)) DO IF NOT EXIST %d $(MD) %d
-endif
+ifeq ($(LIB_PATH),)
+
+dirbase::
+	-CMD.EXE /C FOR %d IN ($(HB_ARCHITECTURE) $(OS2_ARCH_DIR)) DO IF NOT EXIST %d $(MD) %d
 
-ifeq ($(OS2_LIB_ARCH),)
 clean::
-	-IF EXIST $(OS2_ARCH_DIR)\*.* $(RM) $(OS2_ARCH_DIR)\*.*
-	-FOR %d IN ($(OS2_ARCH_DIR) $(HB_ARCHITECTURE)) DO IF EXIST %d $(RD) %d
+	-CMD.EXE /C IF EXIST $(OS2_ARCH_DIR)\*.* $(RM) $(OS2_ARCH_DIR)\*.*
+	-CMD.EXE /C FOR %d IN ($(OS2_ARCH_DIR) $(HB_ARCHITECTURE)) DO IF EXIST %d $(RD) %d
+
 else
+
+dirbase::
+	-CMD.EXE /C FOR %d IN ($(HB_ARCHITECTURE) $(OS2_ARCH_DIR) $(OS2_LIB_PATH) $(OS2_LIB_DIR)) DO IF NOT EXIST %d $(MD) %d
+
 clean::
-	-IF EXIST $(OS2_ARCH_DIR)\*.* $(RM) $(OS2_ARCH_DIR)\*.*
-	-FOR %d IN ($(OS2_ARCH_DIR) $(HB_ARCHITECTURE)) DO IF EXIST %d $(RD) %d
-	-IF EXIST $(OS2_LIB_ARCH) $(RM) $(OS2_LIB_ARCH)
+	-CMD.EXE /C IF EXIST $(OS2_ARCH_DIR)\*.* $(RM) $(OS2_ARCH_DIR)\*.*
+	-CMD.EXE /C FOR %d IN ($(OS2_ARCH_DIR) $(HB_ARCHITECTURE)) DO IF EXIST %d $(RD) %d
+	-CMD.EXE /C IF EXIST $(OS2_LIB_ARCH) $(RM) $(OS2_LIB_ARCH)
+
 endif
 
 else  # bash