From a3417471c75d7dfff695bf085ea358187b883b70 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 5 Jun 2008 00:08:04 +0000
Subject: [PATCH]    * hbpgsql/make_b32.bat    * hbpgsql/make_vc.bat    *
 hbpgsql/tests/bld_b32.bat    * hbpgsql/tests/bld_vc.bat      ! Fixed to use
 the right .dll to generate the .lib.      ; TOMERGE [RC1]

   * hbpgsql/tpostgre.prg
     * Comment.
---
 harbour/ChangeLog                         | 11 +++++++++++
 harbour/contrib/hbpgsql/make_b32.bat      |  9 ++++-----
 harbour/contrib/hbpgsql/make_vc.bat       |  9 ++++-----
 harbour/contrib/hbpgsql/tests/bld_b32.bat |  2 +-
 harbour/contrib/hbpgsql/tests/bld_vc.bat  |  2 +-
 harbour/contrib/hbpgsql/tpostgre.prg      |  4 +++-
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f221ad0b59..a7905c7ebc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-06-05 02:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+   * hbpgsql/make_b32.bat
+   * hbpgsql/make_vc.bat
+   * hbpgsql/tests/bld_b32.bat
+   * hbpgsql/tests/bld_vc.bat
+     ! Fixed to use the right .dll to generate the .lib.
+     ; TOMERGE [RC1]
+
+   * hbpgsql/tpostgre.prg
+     * Comment.
+
 2008-06-05 00:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
    * contrib/hbsqlit2/Makefile
      ! Readded last char of last line.
diff --git a/harbour/contrib/hbpgsql/make_b32.bat b/harbour/contrib/hbpgsql/make_b32.bat
index 8d818a4db9..cf442268b6 100644
--- a/harbour/contrib/hbpgsql/make_b32.bat
+++ b/harbour/contrib/hbpgsql/make_b32.bat
@@ -15,10 +15,9 @@ goto POST_EXIT
 :DIR_OK
 
 if "%HB_INC_PGSQL%" == "" set HB_INC_PGSQL=%HB_DIR_PGSQL%\include
-set CFLAGS=-I"%HB_INC_PGSQL%"
-rem .exe
-set _HB_DLL_NAME=postgres
-set _HB_DLL_DIR=%HB_DIR_PGSQL%\bin
+set CFLAGS=-I"%HB_INC_PGSQL%" -DWIN32 -D__WIN32__ -D__Windows__
+set _HB_DLL_NAME=libpq
+set _HB_DLL_DIR=%HB_DIR_PGSQL%\lib
 
 rem ---------------------------------------------------------------
 
@@ -40,7 +39,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_BUILD
 
-   implib ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME%.exe" >> %_HB_MAKELOG%
+   implib -a ..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" >> %_HB_MAKELOG%
    goto POST_EXIT
 
 :POST_CLEAN
diff --git a/harbour/contrib/hbpgsql/make_vc.bat b/harbour/contrib/hbpgsql/make_vc.bat
index 7147eff680..4a210fe7ea 100644
--- a/harbour/contrib/hbpgsql/make_vc.bat
+++ b/harbour/contrib/hbpgsql/make_vc.bat
@@ -16,9 +16,8 @@ goto POST_EXIT
 
 if "%HB_INC_PGSQL%" == "" set HB_INC_PGSQL=%HB_DIR_PGSQL%\include
 set CFLAGS=-I"%HB_INC_PGSQL%"
-rem .exe
-set _HB_DLL_NAME=postgres
-set _HB_DLL_DIR=%HB_DIR_PGSQL%\bin
+set _HB_DLL_NAME=libpq
+set _HB_DLL_DIR=%HB_DIR_PGSQL%\lib
 
 rem ---------------------------------------------------------------
 
@@ -48,8 +47,8 @@ if "%1" == "INSTALL" goto POST_INSTALL
    echo.   s/^^[ \t]\+[0-9]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+\(.*\)/\1/p>> _temp.sed
    echo. }>> _temp.sed
    echo.}>> _temp.sed
-   DUMPBIN /EXPORTS "%_HB_DLL_DIR%\%_HB_DLL_NAME%.exe" > _dump.tmp
-   echo.LIBRARY "%_HB_DLL_DIR%\%_HB_DLL_NAME%.exe" > _temp.def
+   DUMPBIN /EXPORTS "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" > _dump.tmp
+   echo.LIBRARY "%_HB_DLL_DIR%\%_HB_DLL_NAME%.dll" > _temp.def
    echo.EXPORTS >> _temp.def
    sed -nf _temp.sed < _dump.tmp >> _temp.def
    LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%_HB_DLL_NAME%.lib >> %_HB_MAKELOG%
diff --git a/harbour/contrib/hbpgsql/tests/bld_b32.bat b/harbour/contrib/hbpgsql/tests/bld_b32.bat
index aece0ff940..8714ded2fb 100644
--- a/harbour/contrib/hbpgsql/tests/bld_b32.bat
+++ b/harbour/contrib/hbpgsql/tests/bld_b32.bat
@@ -9,6 +9,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
 
 set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
-set HB_USER_LIBS=hbpgsql.lib postgres.lib
+set HB_USER_LIBS=hbpgsql.lib libpq.lib
 
 call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbpgsql/tests/bld_vc.bat b/harbour/contrib/hbpgsql/tests/bld_vc.bat
index 731465f9aa..0b1e59628f 100644
--- a/harbour/contrib/hbpgsql/tests/bld_vc.bat
+++ b/harbour/contrib/hbpgsql/tests/bld_vc.bat
@@ -9,6 +9,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
 
 set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
-set HB_USER_LIBS=hbpgsql.lib postgres.lib
+set HB_USER_LIBS=hbpgsql.lib libpq.lib
 
 call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbpgsql/tpostgre.prg b/harbour/contrib/hbpgsql/tpostgre.prg
index 47ac5bd537..c47bbf7702 100644
--- a/harbour/contrib/hbpgsql/tpostgre.prg
+++ b/harbour/contrib/hbpgsql/tpostgre.prg
@@ -1,6 +1,8 @@
 /*
  * $Id$
- *
+ */
+
+/*
  * xHarbour Project source code:
  * PostgreSQL RDBMS low level (client api) interface code.
  *