From 287974f000300d578147ccaf0bb84d7529c88182 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 21 Feb 2009 17:46:35 +0000 Subject: [PATCH] 2009-02-21 18:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Fixed forming Harbour installed paths when alternate *nix dir layout is detected. Thanks to Guy also. Please retest. --- harbour/ChangeLog | 6 ++++++ harbour/utils/hbmk2/hbmk2.prg | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cb165b8540..cd6ce78e67 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-21 18:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + ! Fixed forming Harbour installed paths when alternate + *nix dir layout is detected. + Thanks to Guy also. Please retest. + 2009-02-21 18:36 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Fixed recent typo in shared names for *nix systems. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index e952261030..378be58d12 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -507,17 +507,17 @@ FUNCTION Main( ... ) RETURN 3 ENDCASE /* Detect special *nix dir layout (/bin, /lib/harbour, /include/harbour) */ - IF hb_FileExists( s_cHB_INSTALL_PREFIX + hb_osPathSeparator() + "include" +; - hb_osPathSeparator() + "harbour" +; - hb_osPathSeparator() + "hbvm.h" ) + IF hb_FileExists( DirAddPathSep( s_cHB_INSTALL_PREFIX ) + "include" +; + hb_osPathSeparator() + "harbour" +; + hb_osPathSeparator() + "hbvm.h" ) IF Empty( s_cHB_BIN_INSTALL ) - s_cHB_BIN_INSTALL := tmp + "bin" + s_cHB_BIN_INSTALL := DirAddPathSep( s_cHB_INSTALL_PREFIX ) + "bin" ENDIF IF Empty( s_cHB_LIB_INSTALL ) - s_cHB_LIB_INSTALL := tmp + "lib" + hb_osPathSeparator() + "harbour" + s_cHB_LIB_INSTALL := DirAddPathSep( s_cHB_INSTALL_PREFIX ) + "lib" + hb_osPathSeparator() + "harbour" ENDIF IF Empty( s_cHB_INC_INSTALL ) - s_cHB_INC_INSTALL := tmp + "include" + hb_osPathSeparator() + "harbour" + s_cHB_INC_INSTALL := DirAddPathSep( s_cHB_INSTALL_PREFIX ) + "include" + hb_osPathSeparator() + "harbour" ENDIF ENDIF ENDIF