fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-02-21 18:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Fixed forming Harbour installed paths when alternate
      *nix dir layout is detected.
      Thanks to Guy also. Please retest.
This commit is contained in:
Viktor Szakats
2009-02-21 17:46:35 +00:00
parent b37b755697
commit 287974f000
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -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.

12
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -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