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

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

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2009-02-18 23:23:13 +00:00
parent c516ba2778
commit 3be56359f5
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

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

2
harbour/make_gnu.sh
View File

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

11
harbour/utils/hbmk/hbmk2.prg
View File

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