From 3be56359f581d023d1dcd93a289da2e703f14b06 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 18 Feb 2009 23:23:13 +0000 Subject: [PATCH] 2009-02-18 00:22 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk/hbmk2.prg + Added rest of default *nix system paths. % Minor optimization regarding the above. ! Fix regarding the above (include/lib were swapped). * make_gnu.sh * Formatting. --- harbour/ChangeLog | 9 +++++++++ harbour/make_gnu.sh | 2 +- harbour/utils/hbmk/hbmk2.prg | 11 +++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0b858cec2f..330c95e968 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-18 00:22 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk/hbmk2.prg + + Added rest of default *nix system paths. + % Minor optimization regarding the above. + ! Fix regarding the above (include/lib were swapped). + + * make_gnu.sh + * Formatting. + 2009-02-18 23:34 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/hbole/ole2.c * contrib/hbwin/win_ole.c diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh index 11dadb3c46..5a901cf8b0 100755 --- a/harbour/make_gnu.sh +++ b/harbour/make_gnu.sh @@ -189,7 +189,7 @@ if [ -z "$HB_ARCHITECTURE" ] || [ -z "$HB_COMPILER" ]; then echo echo " HB_USER_PRGFLAGS - Extra Harbour compiler options" echo " HB_USER_CFLAGS - Extra C compiler options" - echo " HB_USER_LDFLAGS - Extra linker options" + echo " HB_USER_LDFLAGS - Extra linker options" exit else diff --git a/harbour/utils/hbmk/hbmk2.prg b/harbour/utils/hbmk/hbmk2.prg index 1f39008de2..d07be259ba 100644 --- a/harbour/utils/hbmk/hbmk2.prg +++ b/harbour/utils/hbmk/hbmk2.prg @@ -356,18 +356,21 @@ FUNCTION Main( ... ) s_cHB_INSTALL_PREFIX := "/opt/harbour" - CASE hb_DirBase() == "/usr/local/bin/" + CASE hb_DirBase() == "/usr/local/bin/" .OR. ; + hb_DirBase() == "/usr/bin/" .OR. ; + hb_DirBase() == "/opt/bin/" lSysLoc := .T. + tmp := Left( hb_DirBase(), Len( hb_DirBase() ) - Len( "bin/" ) ) IF Empty( s_cHB_BIN_INSTALL ) - s_cHB_BIN_INSTALL := "/usr/local/bin" + s_cHB_BIN_INSTALL := tmp + "bin" ENDIF IF Empty( s_cHB_LIB_INSTALL ) - s_cHB_LIB_INSTALL := "/usr/local/include/harbour" + s_cHB_LIB_INSTALL := tmp + "lib/harbour" ENDIF IF Empty( s_cHB_INC_INSTALL ) - s_cHB_INC_INSTALL := "/usr/local/lib/harbour" + s_cHB_INC_INSTALL := tmp "include/harbour" ENDIF CASE hb_FileExists( DirAddPathSep( hb_DirBase() ) + cBin_CompPRG )