From c612cf0228c912373323dc3c06552a7a981fb298 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 14 Jun 2012 13:21:54 +0000
Subject: [PATCH] 2012-06-14 15:20 UTC+0200 Viktor Szakats (vszakats
 syenar.net)   * package/winuni/mpkg_win_uni.bat   *
 package/winuni/mpkg_win_uni.nsi     + add all contrib .dlls for x86 and x64
 windows builds       (if present). Untested.

---
 harbour/ChangeLog                       | 6 ++++++
 harbour/package/winuni/mpkg_win_uni.bat | 4 ++--
 harbour/package/winuni/mpkg_win_uni.nsi | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 60fb5957a9..06633fe6a0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-06-14 15:20 UTC+0200 Viktor Szakats (vszakats syenar.net)
+  * package/winuni/mpkg_win_uni.bat
+  * package/winuni/mpkg_win_uni.nsi
+    + add all contrib .dlls for x86 and x64 windows builds
+      (if present). Untested.
+
 2012-06-14 14:40 UTC+0200 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.hbp
     - -head=dep no longer needed (with embedded plugin code)
diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat
index 787549bf87..ff3c474a96 100644
--- a/harbour/package/winuni/mpkg_win_uni.bat
+++ b/harbour/package/winuni/mpkg_win_uni.bat
@@ -119,7 +119,7 @@ echo "%HB_DR%COPYING"                               >> _hbfiles
 echo "%HB_DR%NEWS"                                  >> _hbfiles
 echo "%HB_DR%TODO"                                  >> _hbfiles
 echo "%HB_DR%ChangeLog*"                            >> _hbfiles
-echo "%HB_DR%bin\harbour-%HB_VS%.dll"               >> _hbfiles
+echo "%HB_DR%bin\*-%HB_VS%.dll"                     >> _hbfiles
 echo "%HB_DR%bin\harbour.exe"                       >> _hbfiles
 echo "%HB_DR%bin\hbformat.exe"                      >> _hbfiles
 echo "%HB_DR%bin\hbi18n.exe"                        >> _hbfiles
@@ -169,7 +169,7 @@ echo "%HB_DR%lib\win\watcom\*.*"                    >> _hbfiles
 rem echo "%HB_DR%lib\win\pocc\*.*"                      >> _hbfiles
 rem echo "%HB_DR%lib\win\pocc64\*.*"                    >> _hbfiles
 rem echo "%HB_DR%lib\wce\poccarm\*.*"                   >> _hbfiles
-echo "%HB_DR%bin\harbour-%HB_VS%-x64.dll"           >> _hbfiles
+echo "%HB_DR%bin\*-%HB_VS%-x64.dll"                 >> _hbfiles
 echo "%HB_DR%bin\harbour-%HB_VS%-wce-arm.dll"       >> _hbfiles
 rem echo "%HB_DR%bin\harbour-%HB_VS%-os2.dll"           >> _hbfiles
 echo "%HB_DR%tests\*.*"                             >> _hbfiles
diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi
index ec9cc03313..430e6d6ad6 100644
--- a/harbour/package/winuni/mpkg_win_uni.nsi
+++ b/harbour/package/winuni/mpkg_win_uni.nsi
@@ -91,7 +91,7 @@ Section "Main components" hb_main
   File /nonfatal "$%HB_ABSROOT%ChangeLog*"
 
   SetOutPath $INSTDIR\bin
-  File "$%HB_ABSROOT%bin\harbour-$%HB_VS%.dll"
+  File "$%HB_ABSROOT%bin\*-$%HB_VS%.dll"
   File "$%HB_ABSROOT%bin\harbour.exe"
   File "$%HB_ABSROOT%bin\hbformat.exe"
   File "$%HB_ABSROOT%bin\hbi18n.exe"
@@ -297,7 +297,7 @@ SectionEnd
 !ifndef PKG_NO_COMP_MINGW64
 Section /o "Dlls for x64" hb_dlls_x64
   SetOutPath $INSTDIR\bin
-  File "$%HB_ABSROOT%bin\harbour-$%HB_VS%-x64.dll"
+  File "$%HB_ABSROOT%bin\*-$%HB_VS%-x64.dll"
 SectionEnd
 !endif