From bbd8b2922ea556cb21a64057a323a2b816ab0f97 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 2 May 2000 22:37:24 +0000
Subject: [PATCH] 20000503-00:39 GMT+1 Victor Szakats <info@szelvesz.hu>

---
 harbour/ChangeLog   |  7 ++++++-
 harbour/bin/bld.bat | 28 ++++++++++++++++------------
 harbour/bin/bld.cmd | 28 ++++++++++++++++------------
 harbour/bin/bld.sh  | 28 ++++++++++++++++------------
 4 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4733b91416..dee594903e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+20000503-00:39 GMT+1 Victor Szakats <info@szelvesz.hu>
+
+   * bin/bld.*
+     + Modified to use the HB_???_INSTALL envarrs instead of the hard-wired
+       paths for binaries, include files and libraries.
+
 20000503-00:01 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
 
    * source/rtl/teditor.prg
@@ -13,7 +19,6 @@
    * source/lang/msges.c
      ! Updated by Jose Lalin
 
-
 20000502-19:28 GMT+1 Victor Szakats <info@szelvesz.hu>
 
    * source/vm/hvm.c
diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat
index 87f7412dea..6575c7e48b 100644
--- a/harbour/bin/bld.bat
+++ b/harbour/bin/bld.bat
@@ -16,6 +16,10 @@ rem if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=dos
 rem if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp
 rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
+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
 
    if "%HB_ARCHITECTURE%" == "" goto NO_ARCH
@@ -97,7 +101,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
 :COMPILE
 
-   harbour %1.prg -n -i..\include %2 %3 %HARBOURFLAGS%
+   %HB_BIN_INSTALL%\harbour %1.prg -n -i%HB_LIB_INSTALL% %2 %3 %HARBOURFLAGS%
 
 :A_DOS
 
@@ -109,7 +113,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
    if not "%HB_COMPILER%" == "bcc16" goto A_DOS_BCC16_NOT
 
-      echo -O2 -d -mh %CFLAGS% -I..\include -L..\lib > build.tmp
+      echo -O2 -d -mh %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% > build.tmp
       echo -e%1.exe %1.c >> build.tmp
       echo debug.lib >> build.tmp
       echo vm.lib >> build.tmp
@@ -130,7 +134,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
                                           
    if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT
 
-      echo %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib > build.tmp
+      echo %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% > build.tmp
       echo -ldebug >> build.tmp
       echo -lvm >> build.tmp
       echo -lrtl >> build.tmp
@@ -150,7 +154,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
 :A_DOS_DJGPP_NOT
 
-   if "%HB_COMPILER%" == "rsx32"   gcc %1.c -Zrsx32 %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "rsx32"   gcc %1.c -Zrsx32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
    goto END
 
 :A_W32
@@ -159,11 +163,11 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
    if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin
 
-   if "%HB_COMPILER%" == "bcc32"   bcc32 -O2 -d %CFLAGS% -I..\include -L..\lib %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "rsxnt"   gcc %1.c -Zwin32 %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "msvc"    cl -TP -W3 %CFLAGS% -I..\include %1.c /link /subsystem:CONSOLE ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib
+   if "%HB_COMPILER%" == "bcc32"   bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "rsxnt"   gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "msvc"    cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib user32.lib
    if "%HB_COMPILER%" == "msvc"    echo Ignore LNK4033 warning
 
    goto END
@@ -174,8 +178,8 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
    if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtos2
 
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "icc"     icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I..\include %1.c ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "icc"     icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib
    goto END
 
 :A_LINUX
@@ -184,7 +188,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
    if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtstd
 
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I../include -L../lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L../lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
    goto END
 
 :CLEANUP
diff --git a/harbour/bin/bld.cmd b/harbour/bin/bld.cmd
index 0a59722a80..c13a99903d 100644
--- a/harbour/bin/bld.cmd
+++ b/harbour/bin/bld.cmd
@@ -16,6 +16,10 @@ rem if "%HB_ARCHITECTURE%" == "" set HB_ARCHITECTURE=os2
 rem if "%HB_COMPILER%" == "" set HB_COMPILER=gcc
 rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
+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
 
    if "%HB_ARCHITECTURE%" == "" goto NO_ARCH
@@ -97,7 +101,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
 :COMPILE
 
-   harbour %1.prg -n -i..\include %2 %3 %HARBOURFLAGS%
+   %HB_BIN_INSTALL%\harbour %1.prg -n -i%HB_LIB_INSTALL% %2 %3 %HARBOURFLAGS%
 
 :A_DOS
 
@@ -109,7 +113,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
    if not "%HB_COMPILER%" == "bcc16" goto A_DOS_BCC16_NOT
 
-      echo -O2 -d -mh %CFLAGS% -I..\include -L..\lib > build.tmp
+      echo -O2 -d -mh %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% > build.tmp
       echo -e%1.exe %1.c >> build.tmp
       echo debug.lib >> build.tmp
       echo vm.lib >> build.tmp
@@ -130,7 +134,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
                                           
    if not "%HB_COMPILER%" == "djgpp" goto A_DOS_DJGPP_NOT
 
-      echo %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib > build.tmp
+      echo %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% > build.tmp
       echo -ldebug >> build.tmp
       echo -lvm >> build.tmp
       echo -lrtl >> build.tmp
@@ -150,7 +154,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
 :A_DOS_DJGPP_NOT
 
-   if "%HB_COMPILER%" == "rsx32"   gcc %1.c -Zrsx32 %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "rsx32"   gcc %1.c -Zrsx32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
    goto END
 
 :A_W32
@@ -159,11 +163,11 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
    if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin
 
-   if "%HB_COMPILER%" == "bcc32"   bcc32 -O2 -d %CFLAGS% -I..\include -L..\lib %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c -o%1.exe %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "rsxnt"   gcc %1.c -Zwin32 %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "msvc"    cl -TP -W3 %CFLAGS% -I..\include %1.c /link /subsystem:CONSOLE ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib
+   if "%HB_COMPILER%" == "bcc32"   bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "rsxnt"   gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "msvc"    cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib user32.lib
    if "%HB_COMPILER%" == "msvc"    echo Ignore LNK4033 warning
 
    goto END
@@ -174,8 +178,8 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
    if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtos2
 
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I..\include -L..\lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "icc"     icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I..\include %1.c ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\%_HB_GT_LIB%.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "icc"     icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\common.lib
    goto END
 
 :A_LINUX
@@ -184,7 +188,7 @@ rem if "%HB_GT_LIB%" == "" set HB_GT_LIB=
 
    if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtstd
 
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I../include -L../lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L../lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
    goto END
 
 :CLEANUP
diff --git a/harbour/bin/bld.sh b/harbour/bin/bld.sh
index b476b77266..dc80092566 100644
--- a/harbour/bin/bld.sh
+++ b/harbour/bin/bld.sh
@@ -16,6 +16,10 @@
 # if [ -z "$HB_COMPILER" ]; then export HB_COMPILER=gcc; fi
 # if [ -z "$HB_GT_LIB" ]; then export HB_GT_LIB=; fi
 
+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.
 fi
@@ -77,18 +81,18 @@ if [ -z "$1" ] || [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then
 
 else
 
-   harbour $1.prg -n -i../include $2 $3 $HARBOURFLAGS
+   $HB_BIN_INSTALL/harbour $1.prg -n -i$HB_INC_INSTALL $2 $3 $HARBOURFLAGS
 
    if [ "$HB_ARCHITECTURE" == "dos" ]; then
 
       if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtdos; fi
 
       if [ "$HB_COMPILER" == "bcc16" ]; then
-         bcc -O2 -mh -d $CFLAGS -I..\include -L..\lib $1.c debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
+         bcc -O2 -mh -d $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL $1.c debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
       elif [ "$HB_COMPILER" == "djgpp" ]; then
-         gcc $1.c -o$1.exe $CFLAGS -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommo
+         gcc $1.c -o$1.exe $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfnt -ldbfcd -lcommo
       elif [ "$HB_COMPILER" == "rsx32" ]; then
-         gcc $1.c -Zrsx32 $CFLAGS -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+         gcc $1.c -Zrsx32 $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
       else
          echo Error: HB_COMPILER value is unsupported.
       fi
@@ -98,15 +102,15 @@ else
       if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtwin; fi
 
       if [ "$HB_COMPILER" == "bcc32" ]; then
-         bcc32 -O2 -d $CFLAGS -I..\include -L..\lib $1.c debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
+         bcc32 -O2 -d $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL $1.c debug.lib vm.lib rtl.lib $HB_GT_LIB.lib lang.lib rdd.lib macro.lib pp.lib dbfntx.lib dbfcdx.lib common.lib
       elif [ "$HB_COMPILER" == "gcc" ]; then
-         gcc $1.c -o$1.exe $CFLAGS -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+         gcc $1.c -o$1.exe $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
       elif [ "$HB_COMPILER" == "mingw32" ]; then
-         gcc $1.c -o$1.exe $CFLAGS -mno-cygwin -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+         gcc $1.c -o$1.exe $CFLAGS -mno-cygwin -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
       elif [ "$HB_COMPILER" == "rsxnt" ]; then
-         gcc $1.c -Zwin32 $CFLAGS -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+         gcc $1.c -Zwin32 $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
       elif [ "$HB_COMPILER" == "msvc" ]; then
-         cl -TP -W3 $CFLAGS -I..\include $1.c /link /subsystem:CONSOLE ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\$HB_GT_LIB.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib
+         cl -TP -W3 $CFLAGS -I$HB_INC_INSTALL $1.c /link /subsystem:CONSOLE $HB_LIB_INSTALL\debug.lib $HB_LIB_INSTALL\vm.lib $HB_LIB_INSTALL\rtl.lib $HB_LIB_INSTALL\$HB_GT_LIB.lib $HB_LIB_INSTALL\lang.lib $HB_LIB_INSTALL\rdd.lib $HB_LIB_INSTALL\macro.lib $HB_LIB_INSTALL\pp.lib $HB_LIB_INSTALL\dbfntx.lib $HB_LIB_INSTALL\dbfcdx.lib
          echo Ignore LNK4033 warning
       else
          echo Error: HB_COMPILER value is unsupported.
@@ -117,9 +121,9 @@ else
       if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtos2; fi
 
       if [ "$HB_COMPILER" == "gcc" ]; then
-         gcc $1.c $CFLAGS -I..\include -L..\lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+         gcc $1.c $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
       elif [ "$HB_COMPILER" == "icc" ]; then
-         icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp $CFLAGS -I..\include $1.c ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\$HB_GT_LIB.lib ..\lib\lang.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\vm.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.l
+         icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp $CFLAGS -I$HB_INC_INSTALL $1.c $HB_LIB_INSTALL\debug.lib $HB_LIB_INSTALL\vm.lib $HB_LIB_INSTALL\rtl.lib $HB_LIB_INSTALL\$HB_GT_LIB.lib $HB_LIB_INSTALL\lang.lib $HB_LIB_INSTALL\rdd.lib $HB_LIB_INSTALL\rtl.lib $HB_LIB_INSTALL\vm.lib $HB_LIB_INSTALL\macro.lib $HB_LIB_INSTALL\pp.lib $HB_LIB_INSTALL\dbfntx.lib $HB_LIB_INSTALL\dbfcdx.lib
       else
          echo Error: HB_COMPILER value is unsupported.
       fi
@@ -129,7 +133,7 @@ else
       if [ -z "$HB_GT_LIB" ]; then HB_GT_LIB=gtstd; fi
 
       if [ "$HB_COMPILER" == "gcc" ]; then
-         gcc $1.c $CFLAGS -I../include -L../lib -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
+         gcc $1.c $CFLAGS -I$HB_INC_INSTALL -L$HB_LIB_INSTALL -ldebug -lvm -lrtl -l$HB_GT_LIB -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbfntx -ldbfcdx -lcommon
       else
          echo Error: HB_COMPILER value is unsupported.
       fi