diff --git a/harbour/ChangeLog b/harbour/ChangeLog index beea40a053..1cbcf5b7f4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,52 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-15 00:20 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/xhb/make_b32.bat + * contrib/xhb/make_vc.bat + * contrib/apollo/make_b32.bat + * contrib/apollo/make_vc.bat + * contrib/htmllib/make_b32.bat + * contrib/htmllib/make_vc.bat + * contrib/libct/make_b32.bat + * contrib/libct/make_vc.bat + * contrib/pdflib/make_b32.bat + * contrib/pdflib/make_vc.bat + * contrib/libgt/make_b32.bat + * contrib/libgt/make_vc.bat + * contrib/hbzlib/make_b32.bat + * contrib/hbzlib/make_vc.bat + * contrib/pgsql/make_b32.bat + * contrib/pgsql/make_vc.bat + * contrib/libnf/make_b32.bat + * contrib/libnf/make_vc.bat + * contrib/gd/make_b32.bat + * contrib/gd/make_vc.bat + * contrib/tip/make_b32.bat + * contrib/tip/make_vc.bat + * contrib/adordd/make_b32.bat + * contrib/adordd/make_vc.bat + * contrib/rdd_ads/make_b32.bat + * contrib/rdd_ads/make_vc.bat + * contrib/btree/make_b32.bat + * contrib/btree/make_vc.bat + * contrib/directx/make_b32.bat + * contrib/directx/make_vc.bat + * contrib/win32/make_b32.bat + * contrib/win32/make_vc.bat + * contrib/samples/make_b32.bat + * contrib/samples/make_vc.bat + * contrib/mysql/make_b32.bat + * contrib/mysql/make_vc.bat + * contrib/odbc/make_b32.bat + * contrib/odbc/make_vc.bat + * contrib/bmdbfcdx/make_b32.bat + * contrib/bmdbfcdx/make_vc.bat + ! Removed HB_*_INSTALL manipulation from .bat files. + ! Different but compatible logic added on batch file + level for odbc and rddads, where the batch file is + copying the .dll .libs to the final install dir. + 2007-11-14 23:54 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * common.mak * include/hbextern.ch diff --git a/harbour/contrib/adordd/make_b32.bat b/harbour/contrib/adordd/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/adordd/make_b32.bat +++ b/harbour/contrib/adordd/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/adordd/make_vc.bat b/harbour/contrib/adordd/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/adordd/make_vc.bat +++ b/harbour/contrib/adordd/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/apollo/make_b32.bat b/harbour/contrib/apollo/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/apollo/make_b32.bat +++ b/harbour/contrib/apollo/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/apollo/make_vc.bat b/harbour/contrib/apollo/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/apollo/make_vc.bat +++ b/harbour/contrib/apollo/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/bmdbfcdx/make_b32.bat b/harbour/contrib/bmdbfcdx/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/bmdbfcdx/make_b32.bat +++ b/harbour/contrib/bmdbfcdx/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/bmdbfcdx/make_vc.bat b/harbour/contrib/bmdbfcdx/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/bmdbfcdx/make_vc.bat +++ b/harbour/contrib/bmdbfcdx/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/btree/make_b32.bat b/harbour/contrib/btree/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/btree/make_b32.bat +++ b/harbour/contrib/btree/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/btree/make_vc.bat b/harbour/contrib/btree/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/btree/make_vc.bat +++ b/harbour/contrib/btree/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/directx/make_b32.bat b/harbour/contrib/directx/make_b32.bat index cec776e5c8..109ae8eba7 100644 --- a/harbour/contrib/directx/make_b32.bat +++ b/harbour/contrib/directx/make_b32.bat @@ -55,12 +55,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/directx/make_vc.bat b/harbour/contrib/directx/make_vc.bat index 0e4b1d79f6..0381867c79 100644 --- a/harbour/contrib/directx/make_vc.bat +++ b/harbour/contrib/directx/make_vc.bat @@ -55,12 +55,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/gd/make_b32.bat b/harbour/contrib/gd/make_b32.bat index 46aab210f3..e1f9716d8e 100644 --- a/harbour/contrib/gd/make_b32.bat +++ b/harbour/contrib/gd/make_b32.bat @@ -55,12 +55,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/gd/make_vc.bat b/harbour/contrib/gd/make_vc.bat index 410f261f5f..aa0944bd93 100644 --- a/harbour/contrib/gd/make_vc.bat +++ b/harbour/contrib/gd/make_vc.bat @@ -55,12 +55,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbzlib/make_b32.bat index d802cbcc6c..e761428a92 100644 --- a/harbour/contrib/hbzlib/make_b32.bat +++ b/harbour/contrib/hbzlib/make_b32.bat @@ -51,12 +51,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbzlib/make_vc.bat index 38f38336a1..b73d6213d8 100644 --- a/harbour/contrib/hbzlib/make_vc.bat +++ b/harbour/contrib/hbzlib/make_vc.bat @@ -51,12 +51,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/htmllib/make_b32.bat b/harbour/contrib/htmllib/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/htmllib/make_b32.bat +++ b/harbour/contrib/htmllib/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/htmllib/make_vc.bat b/harbour/contrib/htmllib/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/htmllib/make_vc.bat +++ b/harbour/contrib/htmllib/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/libct/make_b32.bat b/harbour/contrib/libct/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/libct/make_b32.bat +++ b/harbour/contrib/libct/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/libct/make_vc.bat b/harbour/contrib/libct/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/libct/make_vc.bat +++ b/harbour/contrib/libct/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/libgt/make_b32.bat b/harbour/contrib/libgt/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/libgt/make_b32.bat +++ b/harbour/contrib/libgt/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/libgt/make_vc.bat b/harbour/contrib/libgt/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/libgt/make_vc.bat +++ b/harbour/contrib/libgt/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/libnf/make_b32.bat b/harbour/contrib/libnf/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/libnf/make_b32.bat +++ b/harbour/contrib/libnf/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/libnf/make_vc.bat b/harbour/contrib/libnf/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/libnf/make_vc.bat +++ b/harbour/contrib/libnf/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/mysql/make_b32.bat b/harbour/contrib/mysql/make_b32.bat index c56fbde5b6..07d264afbb 100644 --- a/harbour/contrib/mysql/make_b32.bat +++ b/harbour/contrib/mysql/make_b32.bat @@ -57,12 +57,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/mysql/make_vc.bat b/harbour/contrib/mysql/make_vc.bat index 90b7043644..a0421eb97b 100644 --- a/harbour/contrib/mysql/make_vc.bat +++ b/harbour/contrib/mysql/make_vc.bat @@ -57,12 +57,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/odbc/make_b32.bat b/harbour/contrib/odbc/make_b32.bat index dff1dec9ed..86a6c53c39 100644 --- a/harbour/contrib/odbc/make_b32.bat +++ b/harbour/contrib/odbc/make_b32.bat @@ -52,13 +52,12 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% + if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. + set _HB_LIB_INSTALL=%HB_LIB_INSTALL% + if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - copy ..\..\lib\%HB_CC_NAME%\odbc32.lib ..\..\lib\ + copy ..\..\lib\%HB_CC_NAME%\odbc32.lib %_HB_LIB_INSTALL% %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/odbc/make_vc.bat b/harbour/contrib/odbc/make_vc.bat index fe32882129..653e716a9b 100644 --- a/harbour/contrib/odbc/make_vc.bat +++ b/harbour/contrib/odbc/make_vc.bat @@ -68,13 +68,12 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% + if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. + set _HB_LIB_INSTALL=%HB_LIB_INSTALL% + if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - copy ..\..\lib\%HB_CC_NAME%\odbc32.lib ..\..\lib\ + copy ..\..\lib\%HB_CC_NAME%\odbc32.lib %_HB_LIB_INSTALL% %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/pdflib/make_b32.bat b/harbour/contrib/pdflib/make_b32.bat index 643fde4b7e..0fdfdccdee 100644 --- a/harbour/contrib/pdflib/make_b32.bat +++ b/harbour/contrib/pdflib/make_b32.bat @@ -55,12 +55,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/pdflib/make_vc.bat b/harbour/contrib/pdflib/make_vc.bat index ad1a0124f8..e52f0bb913 100644 --- a/harbour/contrib/pdflib/make_vc.bat +++ b/harbour/contrib/pdflib/make_vc.bat @@ -55,12 +55,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/pgsql/make_b32.bat b/harbour/contrib/pgsql/make_b32.bat index a827d6d0a6..5573fcba02 100644 --- a/harbour/contrib/pgsql/make_b32.bat +++ b/harbour/contrib/pgsql/make_b32.bat @@ -57,12 +57,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/pgsql/make_vc.bat b/harbour/contrib/pgsql/make_vc.bat index 2f8c4c1bf7..35bc4b18e9 100644 --- a/harbour/contrib/pgsql/make_vc.bat +++ b/harbour/contrib/pgsql/make_vc.bat @@ -57,12 +57,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/rdd_ads/make_b32.bat b/harbour/contrib/rdd_ads/make_b32.bat index cf98d57ab5..fbfadfb3bf 100644 --- a/harbour/contrib/rdd_ads/make_b32.bat +++ b/harbour/contrib/rdd_ads/make_b32.bat @@ -52,13 +52,12 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% + if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. + set _HB_LIB_INSTALL=%HB_LIB_INSTALL% + if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - copy ..\..\lib\%HB_CC_NAME%\ace32.lib ..\..\lib\ + copy ..\..\lib\%HB_CC_NAME%\ace32.lib %_HB_LIB_INSTALL% %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/rdd_ads/make_vc.bat b/harbour/contrib/rdd_ads/make_vc.bat index 2d4560ffd0..ea52ae7a19 100644 --- a/harbour/contrib/rdd_ads/make_vc.bat +++ b/harbour/contrib/rdd_ads/make_vc.bat @@ -68,13 +68,12 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. + set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX% + if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\.. + set _HB_LIB_INSTALL=%HB_LIB_INSTALL% + if "%_HB_LIB_INSTALL%" == "" set _HB_LIB_INSTALL=%_HB_INSTALL_PREFIX%\lib - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - - copy ..\..\lib\%HB_CC_NAME%\ace32.lib ..\..\lib\ + copy ..\..\lib\%HB_CC_NAME%\ace32.lib %_HB_LIB_INSTALL% %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/samples/make_b32.bat b/harbour/contrib/samples/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/samples/make_b32.bat +++ b/harbour/contrib/samples/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/samples/make_vc.bat b/harbour/contrib/samples/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/samples/make_vc.bat +++ b/harbour/contrib/samples/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/tip/make_b32.bat b/harbour/contrib/tip/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/tip/make_b32.bat +++ b/harbour/contrib/tip/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/tip/make_vc.bat b/harbour/contrib/tip/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/tip/make_vc.bat +++ b/harbour/contrib/tip/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/win32/make_b32.bat b/harbour/contrib/win32/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/win32/make_b32.bat +++ b/harbour/contrib/win32/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/win32/make_vc.bat b/harbour/contrib/win32/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/win32/make_vc.bat +++ b/harbour/contrib/win32/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/xhb/make_b32.bat b/harbour/contrib/xhb/make_b32.bat index fe7a397dad..48d2d5cca2 100644 --- a/harbour/contrib/xhb/make_b32.bat +++ b/harbour/contrib/xhb/make_b32.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT diff --git a/harbour/contrib/xhb/make_vc.bat b/harbour/contrib/xhb/make_vc.bat index 2ab08989e6..8d620fd539 100644 --- a/harbour/contrib/xhb/make_vc.bat +++ b/harbour/contrib/xhb/make_vc.bat @@ -49,12 +49,6 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=..\.. - - if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin - if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include - if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib - %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul goto EXIT