From b29b97c6bb01b994fb19678e7fe136a0cd75b93d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 8 Jun 2009 10:15:14 +0000
Subject: [PATCH] 2009-06-08 11:59 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * mpkg_win.bat   * mpkg_win.nsi     ! Fixed to include
 ChangeLog* instead of ChangeLog alone.

---
 harbour/ChangeLog    |  5 +++++
 harbour/mpkg_win.bat | 13 +++++++------
 harbour/mpkg_win.nsi |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6952c2cdc8..26e9f4f082 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-08 11:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * mpkg_win.bat
+  * mpkg_win.nsi
+    ! Fixed to include ChangeLog* instead of ChangeLog alone.
+
 2009-06-08 11:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * ChangeLog
   + ChangeLog-old
diff --git a/harbour/mpkg_win.bat b/harbour/mpkg_win.bat
index fdfc195e0d..6fab239399 100644
--- a/harbour/mpkg_win.bat
+++ b/harbour/mpkg_win.bat
@@ -15,6 +15,7 @@ rem    - Windows NT or upper
 rem    - NullSoft Installer installed (NSIS)
 rem         https://sourceforge.net/project/showfiles.php?group_id=22049&package_id=15374
 rem    - makensis.exe (part of NSIS) in PATH
+rem         or HB_DIR_NSIS envvar set to its dir with an ending backslash.
 rem    - Info-ZIP zip.exe in PATH
 rem         https://sourceforge.net/project/showfiles.php?group_id=118012
 rem    - HB_COMPILER envvar configured (see INSTALL doc)
@@ -59,11 +60,11 @@ if exist "%HB_BIN_INSTALL%\*.lib" del "%HB_BIN_INSTALL%\*.lib"
 if exist "%HB_BIN_INSTALL%\*.exp" del "%HB_BIN_INSTALL%\*.exp"
 
 rem ; Post-build installation
-xcopy /D /Y ChangeLog "%HB_INSTALL_PREFIX%\"
-xcopy /D /Y COPYING   "%HB_INSTALL_PREFIX%\"
-xcopy /D /Y ERRATA    "%HB_INSTALL_PREFIX%\"
-xcopy /D /Y INSTALL   "%HB_INSTALL_PREFIX%\"
-xcopy /D /Y TODO      "%HB_INSTALL_PREFIX%\"
+xcopy /D /Y ChangeLog* "%HB_INSTALL_PREFIX%\"
+xcopy /D /Y COPYING    "%HB_INSTALL_PREFIX%\"
+xcopy /D /Y ERRATA     "%HB_INSTALL_PREFIX%\"
+xcopy /D /Y INSTALL    "%HB_INSTALL_PREFIX%\"
+xcopy /D /Y TODO       "%HB_INSTALL_PREFIX%\"
 
 rem ; Build .zip package
 if exist %HB_PKGNAME%.zip del %HB_PKGNAME%.zip
@@ -73,7 +74,7 @@ zip -9 -X -r -o %~dp0%HB_PKGNAME%.zip . -i %HB_DIRNAME%\*
 popd
 
 rem ; Build installer package
-makensis.exe %~dp0mpkg_win.nsi
+%HB_DIR_NSIS%makensis.exe %~dp0mpkg_win.nsi
 
 :MK_ERROR
 
diff --git a/harbour/mpkg_win.nsi b/harbour/mpkg_win.nsi
index 929bd693d1..e05ef84670 100644
--- a/harbour/mpkg_win.nsi
+++ b/harbour/mpkg_win.nsi
@@ -77,7 +77,7 @@ Section "Main components" hb_main
   File /nonfatal "$%HB_INSTALL_PREFIX%\ERRATA"
   File /nonfatal "$%HB_INSTALL_PREFIX%\INSTALL"
   File /nonfatal "$%HB_INSTALL_PREFIX%\TODO"
-  File /nonfatal "$%HB_INSTALL_PREFIX%\ChangeLog"
+  File /nonfatal "$%HB_INSTALL_PREFIX%\ChangeLog*"
 
   SetOutPath $INSTDIR\bin
   File "$%HB_BIN_INSTALL%\*.*"