From 8eb52166ad62d66508dc544dfc1b26d2a27d363d Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Wed, 4 Nov 2009 19:05:01 +0000
Subject: [PATCH] 2009-11-04 20:04 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/utils/hbmk2/hbmk2.prg     ! do not
 overwrite file extensions set in .clp file when checking       dependencies
 in incremental mode

---
 harbour/ChangeLog             |  5 +++++
 harbour/utils/hbmk2/hbmk2.prg | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d6f7d635cf..8edc54798f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-04 20:04 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/utils/hbmk2/hbmk2.prg
+    ! do not overwrite file extensions set in .clp file when checking
+      dependencies in incremental mode
+
 2009-11-04 19:51 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/utils/hbmk2/hbmk2.prg
     ! fixed incremental mode for @.clp files.
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 62aba2c37a..04c13f03e4 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -4920,7 +4920,7 @@ STATIC FUNCTION clpfile_read( cFileName )
 
    aFiles := hb_aTokens( cFileBody,, .t. )
    FOR EACH cFile IN aFiles
-      cFile := FN_ExtSet( StrTran( cFile, '"' ), ".prg" )
+      cFile := FN_ExtDef( StrTran( cFile, '"' ), ".prg" )
    NEXT
 
    RETURN aFiles
@@ -5624,6 +5624,16 @@ STATIC FUNCTION FN_ExtGet( cFileName )
 
    RETURN cExt
 
+STATIC FUNCTION FN_ExtDef( cFileName, cDefExt )
+   LOCAL cDir, cName, cExt
+
+   hb_FNameSplit( cFileName, @cDir, @cName, @cExt )
+   IF Empty( cExt )
+      cExt := cDefExt
+   ENDIF
+
+   RETURN hb_FNameMerge( cDir, cName, cExt )
+
 STATIC FUNCTION FN_ExtSet( cFileName, cExt )
    LOCAL cDir, cName