From 07104ffa29c50993a7d4708128936f6ce0b9ef04 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 27 Jun 2009 00:28:48 +0000
Subject: [PATCH] 2009-06-26 02:28 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * bin/postinst.bat   * mpkg_gnu.bat     + Moved copying of root
 doc (ChangeLog, INSTALL) files       to postinst.bat.

  * make_gnu.bat
    ! Minor fix to not accept extra cmdline parameters when
      in full build mode.
---
 harbour/ChangeLog        | 10 ++++++++++
 harbour/bin/postinst.bat |  7 +++++++
 harbour/make_gnu.bat     |  8 ++++----
 harbour/mpkg_gnu.bat     |  7 -------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d7d4707e1a..0fcee230f9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-26 02:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * bin/postinst.bat
+  * mpkg_gnu.bat
+    + Moved copying of root doc (ChangeLog, INSTALL) files
+      to postinst.bat.
+
+  * make_gnu.bat
+    ! Minor fix to not accept extra cmdline parameters when
+      in full build mode.
+
 2009-06-26 01:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * make_gnu.bat
     + Now make_gnu.bat will find embedded GNU Make even if it's
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index a3c99ba360..3e7616e9aa 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -19,6 +19,13 @@ echo # Generated by Harbour build process>> %HB_BIN_INSTALL%\hbmk.cfg
 echo arch=%HB_ARCHITECTURE%>> %HB_BIN_INSTALL%\hbmk.cfg
 echo comp=%HB_COMPILER%>> %HB_BIN_INSTALL%\hbmk.cfg
 
+rem ; Post-build installation
+if not "%HB_INSTALL_PREFIX%" == "" copy /Y ChangeLog* "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" copy /Y COPYING    "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" copy /Y ERRATA     "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" copy /Y INSTALL    "%HB_INSTALL_PREFIX%\" > nul
+if not "%HB_INSTALL_PREFIX%" == "" copy /Y TODO       "%HB_INSTALL_PREFIX%\" > nul
+
 goto INST_%HB_ARCHITECTURE%
 
 :INST_WIN
diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat
index f960630f60..5d0313a19e 100644
--- a/harbour/make_gnu.bat
+++ b/harbour/make_gnu.bat
@@ -184,7 +184,7 @@ if "%HB_COMPILER%"     == ""                         set HB_COMPILER=djgpp
    set HB_CONTRIB_ADDONS=
    set HB_EXTERNALLIBS=no
    set HB_EXTERNAL_ADDONS=
-   %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 %_HB_BUILD_LOG%
+   %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %_HB_BUILD_LOG%
    if errorlevel 1 echo Harbour GNU Make returned: %ERRORLEVEL%
    if errorlevel 1 goto MAKE_DONE
    set HB_DYNLIB=no
@@ -196,21 +196,21 @@ if "%HB_COMPILER%"     == ""                         set HB_COMPILER=djgpp
    set _HB_CONTRIB_ADDONS=
    set _HB_EXTERNALLIBS=
    set _HB_EXTERNAL_ADDONS=
-   %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 %_HB_BUILD_LOG%
+   %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %_HB_BUILD_LOG%
    if errorlevel 1 echo Harbour GNU Make returned: %ERRORLEVEL%
    goto MAKE_DONE
 
 :DO_GCC
 
    set HB_DYNLIB=no
-   %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 %_HB_BUILD_LOG%
+   %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %_HB_BUILD_LOG%
    if errorlevel 1 echo Harbour GNU Make returned: %ERRORLEVEL%
    goto MAKE_DONE
 
 :DO_GCC_CYG
 
    set HB_DYNLIB=no
-   sh make_gnu.sh clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
+   sh make_gnu.sh clean install %HB_USER_MAKEFLAGS%
    if errorlevel 1 echo Harbour GNU Make returned: %ERRORLEVEL%
    goto MAKE_DONE
 
diff --git a/harbour/mpkg_gnu.bat b/harbour/mpkg_gnu.bat
index 8aacd99735..93f2b0556e 100644
--- a/harbour/mpkg_gnu.bat
+++ b/harbour/mpkg_gnu.bat
@@ -72,13 +72,6 @@ if exist "%HB_INSTALL_PREFIX%\bin\*.tds" del "%HB_INSTALL_PREFIX%\bin\*.tds"
 if exist "%HB_INSTALL_PREFIX%\bin\*.lib" del "%HB_INSTALL_PREFIX%\bin\*.lib"
 if exist "%HB_INSTALL_PREFIX%\bin\*.exp" del "%HB_INSTALL_PREFIX%\bin\*.exp"
 
-rem ; Post-build installation
-copy /Y ChangeLog* "%HB_INSTALL_PREFIX%\" > nul
-copy /Y COPYING    "%HB_INSTALL_PREFIX%\" > nul
-copy /Y ERRATA     "%HB_INSTALL_PREFIX%\" > nul
-copy /Y INSTALL    "%HB_INSTALL_PREFIX%\" > nul
-copy /Y TODO       "%HB_INSTALL_PREFIX%\" > nul
-
 rem ; Build .zip package
 echo Harbour .zip install package creation: '%HB_PKGNAME%.zip'
 if exist "%HB_PKGNAME%.zip" del "%HB_PKGNAME%.zip"