From e2be0e8a99d3278b4b070c6dc475a99dfcfbd540 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 13 Sep 2007 11:47:53 +0000
Subject: [PATCH] 2007-09-13 13:30 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)    * makefile.vc    * makefile.gc    * makefile.bc    *
 config/rules.cf      + Using Harbour -kM switch when building Harbour itself.
        (this switch will turn off macro substitution in string       
 literals.)

---
 harbour/ChangeLog       | 9 +++++++++
 harbour/config/rules.cf | 2 +-
 harbour/makefile.bc     | 2 +-
 harbour/makefile.gc     | 2 +-
 harbour/makefile.vc     | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d460e16192..f6d9ca778b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-09-13 13:30 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * makefile.vc
+   * makefile.gc
+   * makefile.bc
+   * config/rules.cf
+     + Using Harbour -kM switch when building Harbour itself.
+       (this switch will turn off macro substitution in string 
+       literals.)
+
 2007-09-13 13:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * tests/rto_get.prg
      * Changes missed from previous commit.
diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf
index 2c682e670c..ce8c36ccb2 100644
--- a/harbour/config/rules.cf
+++ b/harbour/config/rules.cf
@@ -20,7 +20,7 @@ HB := $(HB_BIN_COMPILE)/
 endif
 HB := $(HB)harbour$(EXE_EXT)
 
-HB_FLAGS = -n -q0 -w2 -es2 -gc0 -I$(TOP) -I$(HB_INC_COMPILE)
+HB_FLAGS = -n -q0 -w2 -es2 -gc0 -kM -I$(TOP) -I$(HB_INC_COMPILE)
 
 # The rule to link an executable.
 ifeq ($(LD_RULE),)
diff --git a/harbour/makefile.bc b/harbour/makefile.bc
index 85188293c5..e139cb047d 100644
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -152,7 +152,7 @@ CLIBFLAGSDLL   = -D__EXPORT__ -tWM $(BCCDLL_WITH_DYNRT) $(CLIBFLAGS) $(CLIBFLAGS
 CEXEFLAGSDLL   = -tWM $(BCCDLL_WITH_DYNRT) $(CLIBFLAGS) $(CEXEFLAGSDLL)
 
 # Harbour Compiler Flags
-HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc0 $(PRG_USR)
+HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc0 -kM $(PRG_USR)
 !ifdef HB_DOC_PDF
     HBFLAGSCMN = $(HBFLAGSCMN) -dPDF
 !endif
diff --git a/harbour/makefile.gc b/harbour/makefile.gc
index 98dcf9ceff..953a5792f7 100644
--- a/harbour/makefile.gc
+++ b/harbour/makefile.gc
@@ -176,7 +176,7 @@ CLIBFLAGSDLL   := -D__EXPORT__ $(CLIBFLAGS) $(CLIBFLAGSDLL)
 CEXEFLAGSDLL   := $(CLIBFLAGS) $(CEXEFLAGSDLL)
 
 # Harbour Compiler Flags
-HBFLAGSCMN     := -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc0 $(PRG_USR)
+HBFLAGSCMN     := -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc0 -kM $(PRG_USR)
 ifdef HB_DOC_PDF
 HBFLAGSCMN     := $(HBFLAGSCMN) -dPDF
 endif
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index fda3386f2c..4689efb2b3 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -167,7 +167,7 @@ CLIBFLAGSDLL   = -D__EXPORT__ $(CLIBFLAGS) $(CLIBFLAGSDLL)
 CEXEFLAGSDLL   = $(CLIBFLAGS) $(CEXEFLAGSDLL)
 
 # Harbour Compiler Flags
-HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc1 $(PRG_USR)
+HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc0 -kM $(PRG_USR)
 !ifdef HB_DOC_PDF
 HBFLAGSCMN  = $(HBFLAGSCMN) -dPDF
 !endif