From a255567515603fbb2a43e22f3b4815bd4686db3a Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 14 Jun 2009 17:59:01 +0000
Subject: [PATCH] 2009-06-14 19:56 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * INSTALL     * Updated.

  * source/pp/Makefile
    ! Fixed to ignore clean command result which is a TOFIX.
      (anyone to help here?)
    ! Changed ChangeLog file detection to specifically look
      for CHANGE~1 and to not look for CHANGE~* and CHANG~*
      where the latter cannot exist and the former may
      accidentally pick up wrong file.
---
 harbour/ChangeLog          | 17 +++++++++++++++--
 harbour/INSTALL            |  5 +----
 harbour/source/pp/Makefile |  7 ++-----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0304a14c2c..542db8f7a3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-14 19:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    * Updated.
+
+  * source/pp/Makefile
+    ! Fixed to ignore clean command result which is a TOFIX.
+      (anyone to help here?)
+    ! Changed ChangeLog file detection to specifically look
+      for CHANGE~1 and to not look for CHANGE~* and CHANG~*
+      where the latter cannot exist and the former may
+      accidentally pick up wrong file.
+
 2009-06-14 09:03 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/gtqtc/gtqtc.cpp
   * harbour/contrib/gtqtc/gtqtc.h
@@ -72,8 +84,9 @@
     ; TOFIX: HB_CHANGELOG value for DOS builds. It's currently
              broken for MS-DOS hosts. To avoid these problems
              we should use 'CHANGES' instead of 'ChangeLog'...
+             [DONE]
     ; TOFIX: I applied Przemek's patch to make_gnu.sh wrongly,
-             and have no idea how to fix it.
+             and have no idea how to fix it. [DONE]
 
 2009-06-14 11:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbxbp/xbpmenubar.prg
@@ -1106,7 +1119,7 @@
   * mpkg_deb.sh
   * harbour.spec
     - Deleted hbmsql.
-    ; TOFIX: hbqt is missing from some Linux make files.
+    ; TOFIX: hbqt is missing from some Linux mpkg files.
     ; TOFIX: (in next major release) We should try to
              make Linux build files less-maintenance intensive.
 
diff --git a/harbour/INSTALL b/harbour/INSTALL
index d7c56c5b18..364c7dd666 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -103,10 +103,6 @@ HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE
       > set HB_INSTALL_PREFIX=<DIR>
       > make_gnu.bat install
 
-      NOTE: Build process was only tested on Windows host system,
-            and most probably it doesn't work anymore under
-            pure MS-DOS.
-
    OS/2
    ----
       > set HB_COMPILER=<[gcc]|watcom>
@@ -547,6 +543,7 @@ EXAMPLES
       --8<--
       rem ; To create installation packages (.zip),
       rem   replace last line (calling make_gnu.bat) with this one:
+      rem   (this will only work when using Windows host)
       call mpkg_dos.bat > log-%HB_COMPILER%.txt 2>&1
       -->8--
 
diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile
index 82c3012cc1..a25bf48fcd 100644
--- a/harbour/source/pp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -32,10 +32,7 @@ ifeq ($(HB_CHANGELOG),)
 ifeq ($(HB_CHANGELOG),)
    HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange[Ll]o)
 ifeq ($(HB_CHANGELOG),)
-   HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange~?)
-ifeq ($(HB_CHANGELOG),)
-   HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hang~??)
-endif
+   HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange~1)
 endif
 endif
 endif
@@ -59,4 +56,4 @@ install::
 	$(INSTALL_RULE_LIBRARIES)
 
 clean::
-	$(RM) $(HB_VERHEADER)
+	-$(RM) $(HB_VERHEADER)