From 809b9847747384fa83c183be5128c70526b9bdae Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 20 Aug 2009 13:38:47 +0000
Subject: [PATCH] 2009-08-20 15:38 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/dos/watcom.mk     * DOS shell specific hacks protected
 by HB_SHELL guard.     * Merged together DOS shell specific hacks.

  * config/win/watcom.mk
  * config/linux/watcom.mk
  * config/os2/watcom.mk
    + Added DOS shell specific hacks, so that cross-builds to these
      targets on DOS hosts work.
---
 harbour/ChangeLog              | 11 +++++++++++
 harbour/config/dos/watcom.mk   | 30 ++++++++++++++++--------------
 harbour/config/linux/watcom.mk | 17 +++++++++++++++++
 harbour/config/os2/watcom.mk   | 17 +++++++++++++++++
 harbour/config/win/watcom.mk   | 17 +++++++++++++++++
 5 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3508ff48e1..0c6c2d2b4c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-20 15:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/dos/watcom.mk
+    * DOS shell specific hacks protected by HB_SHELL guard.
+    * Merged together DOS shell specific hacks.
+
+  * config/win/watcom.mk
+  * config/linux/watcom.mk
+  * config/os2/watcom.mk
+    + Added DOS shell specific hacks, so that cross-builds to these
+      targets on DOS hosts work.
+
 2009-08-20 14:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
   * INSTALL
diff --git a/harbour/config/dos/watcom.mk b/harbour/config/dos/watcom.mk
index a2921ee3d2..a056eb850f 100644
--- a/harbour/config/dos/watcom.mk
+++ b/harbour/config/dos/watcom.mk
@@ -64,14 +64,6 @@ ifeq ($(CC),wcc386)
    endif
 endif
 
-# work arround to DOS command line size limit
-ifeq ($(CC),wcc386)
-   export WCC386 := $(strip $(CPPFLAGS))
-else
-   export WPP386 := $(strip $(CPPFLAGS))
-endif
-CPPFLAGS :=
-
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 #       It causes that every command will be separated by LF
 define link_file
@@ -124,11 +116,21 @@ AR := wlib
 ARFLAGS := -q -p=64 -c -n
 AR_RULE = $(create_library)
 
-# disable DOS/4GW Banner
-export DOS4G := quiet
+ifeq ($(HB_SHELL),dos)
+
+   # disable DOS/4GW Banner
+   export DOS4G := quiet
+
+   # work arround to DOS command line size limit
+   ifeq ($(CC),wcc386)
+      export WCC386 := $(strip $(CPPFLAGS))
+   else
+      export WPP386 := $(strip $(CPPFLAGS))
+   endif
+   CPPFLAGS :=
+
+   export HARBOURCMD := $(HB_FLAGS)
+   HB_FLAGS :=
+endif
 
 include $(TOP)$(ROOT)config/rules.mk
-
-# work arround to DOS command line size limit
-export HARBOURCMD := $(HB_FLAGS)
-HB_FLAGS :=
diff --git a/harbour/config/linux/watcom.mk b/harbour/config/linux/watcom.mk
index 241ddfc0fe..f8d1d081e0 100644
--- a/harbour/config/linux/watcom.mk
+++ b/harbour/config/linux/watcom.mk
@@ -85,4 +85,21 @@ AR := wlib
 ARFLAGS := -q -c -n
 AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file))
 
+ifeq ($(HB_SHELL),dos)
+
+   # disable DOS/4GW Banner
+   export DOS4G := quiet
+
+   # work arround to DOS command line size limit
+   ifeq ($(CC),wcc386)
+      export WCC386 := $(strip $(CPPFLAGS))
+   else
+      export WPP386 := $(strip $(CPPFLAGS))
+   endif
+   CPPFLAGS :=
+
+   export HARBOURCMD := $(HB_FLAGS)
+   HB_FLAGS :=
+endif
+
 include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/os2/watcom.mk b/harbour/config/os2/watcom.mk
index aa8dba6d9c..730ac2a2ff 100644
--- a/harbour/config/os2/watcom.mk
+++ b/harbour/config/os2/watcom.mk
@@ -108,4 +108,21 @@ AR := wlib
 ARFLAGS := -q -p=64 -c -n
 AR_RULE = $(create_library)
 
+ifeq ($(HB_SHELL),dos)
+
+   # disable DOS/4GW Banner
+   export DOS4G := quiet
+
+   # work arround to DOS command line size limit
+   ifeq ($(CC),wcc386)
+      export WCC386 := $(strip $(CPPFLAGS))
+   else
+      export WPP386 := $(strip $(CPPFLAGS))
+   endif
+   CPPFLAGS :=
+
+   export HARBOURCMD := $(HB_FLAGS)
+   HB_FLAGS :=
+endif
+
 include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk
index b84e6819ca..22f6a4e1e3 100644
--- a/harbour/config/win/watcom.mk
+++ b/harbour/config/win/watcom.mk
@@ -115,4 +115,21 @@ AR := wlib
 ARFLAGS := -q -p=64 -c -n
 AR_RULE = $(create_library)
 
+ifeq ($(HB_SHELL),dos)
+
+   # disable DOS/4GW Banner
+   export DOS4G := quiet
+
+   # work arround to DOS command line size limit
+   ifeq ($(CC),wcc386)
+      export WCC386 := $(strip $(CPPFLAGS))
+   else
+      export WPP386 := $(strip $(CPPFLAGS))
+   endif
+   CPPFLAGS :=
+
+   export HARBOURCMD := $(HB_FLAGS)
+   HB_FLAGS :=
+endif
+
 include $(TOP)$(ROOT)config/rules.mk