diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2b4aefd5dd..9eba3b1083 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+20000429-09:50 GMT+1 Victor Szakats <info@szelvesz.hu>
+
+   * bin/bld.*
+   * make_gnu.*
+     ! Some fixes.
+
 20000427-15:34 GMT+1 Victor Szakats <info@szelvesz.hu>
 
    * source/compiler/harbour.c
diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat
index 6e35965dbe..87f7412dea 100644
--- a/harbour/bin/bld.bat
+++ b/harbour/bin/bld.bat
@@ -40,7 +40,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
    echo.
    echo     HB_ARCHITECTURE:
    echo       - dos   (HB_GT_LIB=gtdos by default)
-   echo       - w32   (HB_GT_LIB=gtw32 by default)
+   echo       - w32   (HB_GT_LIB=gtwin by default)
    echo       - linux (HB_GT_LIB=gtstd by default)
    echo       - os2   (HB_GT_LIB=gtos2 by default)
    echo.   
diff --git a/harbour/bin/bld.cmd b/harbour/bin/bld.cmd
index 8e103d18e5..0a59722a80 100644
--- a/harbour/bin/bld.cmd
+++ b/harbour/bin/bld.cmd
@@ -40,7 +40,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
    echo.
    echo     HB_ARCHITECTURE:
    echo       - dos   (HB_GT_LIB=gtdos by default)
-   echo       - w32   (HB_GT_LIB=gtw32 by default)
+   echo       - w32   (HB_GT_LIB=gtwin by default)
    echo       - linux (HB_GT_LIB=gtstd by default)
    echo       - os2   (HB_GT_LIB=gtos2 by default)
    echo.   
diff --git a/harbour/bin/bld.sh b/harbour/bin/bld.sh
index 56e3713e4b..b476b77266 100644
--- a/harbour/bin/bld.sh
+++ b/harbour/bin/bld.sh
@@ -40,7 +40,7 @@ if [ -z "$1" ] || [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then
    echo
    echo "    HB_ARCHITECTURE:"
    echo "      - dos   (HB_GT_LIB=gtdos by default)"
-   echo "      - w32   (HB_GT_LIB=gtw32 by default)"
+   echo "      - w32   (HB_GT_LIB=gtwin by default)"
    echo "      - linux (HB_GT_LIB=gtstd by default)"
    echo "      - os2   (HB_GT_LIB=gtos2 by default)"
    echo
diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat
index dc75e0d841..924595e980 100644
--- a/harbour/make_gnu.bat
+++ b/harbour/make_gnu.bat
@@ -24,9 +24,9 @@ rem set L_USR=
 
 rem Set to constant value to be consistent with the non-GNU make files.
 
-set HB_BIN_INSTALL=bin\
-set HB_LIB_INSTALL=lib\
-set HB_INC_INSTALL=include\
+if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=bin\
+if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=lib\
+if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=include\
 
 :START
 
diff --git a/harbour/make_gnu.cmd b/harbour/make_gnu.cmd
index 1e5d958244..984b85bc42 100644
--- a/harbour/make_gnu.cmd
+++ b/harbour/make_gnu.cmd
@@ -24,9 +24,9 @@ rem set L_USR=
 
 rem Set to constant value to be consistent with the non-GNU make files.
 
-set HB_BIN_INSTALL=bin\
-set HB_LIB_INSTALL=lib\
-set HB_INC_INSTALL=include\
+if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=bin\
+if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=lib\
+if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=include\
 
 :START
 
diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh
index 5810a187b3..2d8d90635a 100644
--- a/harbour/make_gnu.sh
+++ b/harbour/make_gnu.sh
@@ -24,9 +24,9 @@ if [ -z "$HB_GT_LIB" ]; then export HB_GT_LIB=; fi
 
 # Set to constant value to be consistent with the non-GNU make files.
 
-export HB_BIN_INSTALL=bin/
-export HB_LIB_INSTALL=lib/
-export HB_INC_INSTALL=include/
+if [ -z "$HB_BIN_INSTALL" ]; then export HB_BIN_INSTALL=bin/; fi    
+if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL=lib/; fi    
+if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL=include/; fi
 
 if [ -z "$HB_ARCHITECTURE" ]; then
    echo Error: HB_ARCHITECTURE is not set.