diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8eeef67c08..b249e12d07 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,24 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-13 23:21 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * make_gnu.bat
+  * config/win/global.cf
+    * HB_BUILD_DLL is now processed by make_gnu.bat and another
+      internal envvar is used to request DLL flags from the GNU
+      Make. This way some side effects are avoided when doing a
+      make_gnu.sh launched build.
+
+  * make_gnu.sh
+    + Emptying CLIPPER/HARBOUR envvars before starting the build.
+      (please test)
+
+  * contrib/hbfbird/firebird.c
+    * Minor formatting.
+
+  * contrib/hbcurl/hbcurl.c
+    ! Fixed warning/bug in recently added feature.
+
 2009-03-13 16:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * mpkg_win.bat
     * Cleanup.
diff --git a/harbour/config/win/global.cf b/harbour/config/win/global.cf
index 31e1248a5c..980f6880e7 100644
--- a/harbour/config/win/global.cf
+++ b/harbour/config/win/global.cf
@@ -18,7 +18,7 @@ HB_GT_LIST=\
 # verify if GT drivers exist
 HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),))
 
-ifeq ($(HB_BUILD_DLL),yes)
+ifeq ($(HB_DYNLIB),yes)
    HB_CDYNLIB=-DHB_DYNLIB
 endif
 
diff --git a/harbour/contrib/hbcurl/hbcurl.c b/harbour/contrib/hbcurl/hbcurl.c
index 9c8718e8f6..d81a4c82a0 100644
--- a/harbour/contrib/hbcurl/hbcurl.c
+++ b/harbour/contrib/hbcurl/hbcurl.c
@@ -1671,9 +1671,9 @@ HB_FUNC( CURL_EASY_GETINFO )
          break;
       case HB_CURLINFO_CERTINFO:
 #if LIBCURL_VERSION_NUM >= 0x071301
-         res = HB_CURL_EASY_GETINFO( hb_curl, CURLINFO_CERTINFO, ( struct curl_slist * ) &ret_ptr );
+         res = HB_CURL_EASY_GETINFO( hb_curl, CURLINFO_CERTINFO, &ret_slist );
 #endif
-         type = HB_CURL_INFO_TYPE_PTR;
+         type = HB_CURL_INFO_TYPE_SLIST;
          break;
       }
 
diff --git a/harbour/contrib/hbfbird/firebird.c b/harbour/contrib/hbfbird/firebird.c
index 7658cb658e..581a7df0bd 100644
--- a/harbour/contrib/hbfbird/firebird.c
+++ b/harbour/contrib/hbfbird/firebird.c
@@ -95,11 +95,11 @@ HB_FUNC( FBCREATEDB )
       int            page    = hb_parni( 4 );
       char *         charset = hb_parcx( 5 );
       unsigned short dialect = ( unsigned short ) hb_parni( 6 );
-       
-      hb_snprintf( create_db, sizeof( create_db ), 
+
+      hb_snprintf( create_db, sizeof( create_db ),
                 "CREATE DATABASE '%s' USER '%s' PASSWORD '%s' PAGE_SIZE = %i DEFAULT CHARACTER SET %s",
                 db_name, user, pass, page, charset );
-      
+
       if( isc_dsql_execute_immediate( status, &newdb, &trans, 0, create_db, dialect, NULL ) )
          hb_retnl( isc_sqlcode( status ) );
       else
@@ -160,7 +160,7 @@ HB_FUNC( FBERROR )
 {
    char msg[ MAX_BUFFER ];
 
-   isc_sql_interprete( ( short ) hb_parni( 1 ) /* sqlcode */, 
+   isc_sql_interprete( ( short ) hb_parni( 1 ) /* sqlcode */,
                        msg,
                        sizeof( msg ) );
 
@@ -558,7 +558,7 @@ HB_FUNC( FBGETDATA )
             {
                ISC_INT64 tens = 1;
                short     i;
-           
+
                for( i = 0; i > dscale; i-- )
                   tens *= 10;
 
@@ -567,7 +567,7 @@ HB_FUNC( FBGETDATA )
                             field_width - 1 + dscale,
                             ( ISC_INT64 ) value / tens,
                             -dscale,
-                            ( ISC_INT64 ) value % tens);
+                            ( ISC_INT64 ) value % tens );
                else if( ( value / tens ) != 0 )
                   hb_snprintf( data, sizeof( data ), "%*" ISC_INT64_FORMAT "d.%0*" ISC_INT64_FORMAT "d",
                             field_width - 1 + dscale,
@@ -651,11 +651,11 @@ HB_FUNC( FBGETBLOB )
 
          /* p = ( char * ) hb_xgrab( blob_seg_len + 1 ); */
          hb_snprintf( p, sizeof( p ), "%*.*s", blob_seg_len, blob_seg_len, blob_segment );
-      
+
          temp = hb_itemPutC( NULL, p );
          hb_arrayAdd( aNew, temp );
          hb_itemRelease( temp );
-      
+
          /* hb_xfree(p); */
          blob_stat = isc_get_segment( status, &blob_handle,
                                       ( unsigned short * ) &blob_seg_len,
diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat
index 45e0bd7e9e..a4ec70df42 100644
--- a/harbour/make_gnu.bat
+++ b/harbour/make_gnu.bat
@@ -119,18 +119,18 @@ if not exist %HB_DOC_INSTALL%\*.* md %HB_DOC_INSTALL%
 
    set _HB_CONTRIBLIBS=%HB_CONTRIBLIBS%
    set _HB_CONTRIB_ADDONS=%HB_CONTRIB_ADDONS%
+   set HB_DYNLIB=yes
    set HB_CONTRIBLIBS=no
    set HB_CONTRIB_ADDONS=
    %_HB_MAKE% clean   %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
    %_HB_MAKE% install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
-   set HB_BUILD_DLL=
+   set HB_DYNLIB=no
    set HB_CONTRIBLIBS=%_HB_CONTRIBLIBS%
    set HB_CONTRIB_ADDONS=%_HB_CONTRIB_ADDONS%
    set _HB_CONTRIBLIBS=
    set _HB_CONTRIB_ADDONS=
    %_HB_MAKE% clean   %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
    %_HB_MAKE% install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
-   set HB_BUILD_DLL=yes
    goto MAKE_DONE
 
 :SKIP_WINDLL
diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh
index ae26437325..baf1da385c 100755
--- a/harbour/make_gnu.sh
+++ b/harbour/make_gnu.sh
@@ -200,6 +200,9 @@ if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then
 
 else
 
+    export HARBOUR=
+    export CLIPPER=
+
     # ---------------------------------------------------------------
     # Start the GNU make system