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

2009-12-19 13:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
  * config/global.mk
    ! Not considering /opt and /opt/harbour as "system location" for
      Harbour, following Lorenzo's advice.
This commit is contained in:
Viktor Szakats
2009-12-19 12:47:02 +00:00
parent 5907e1d204
commit 3b929ea65e
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -17,6 +17,12 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-19 13:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
* config/global.mk
! Not considering /opt and /opt/harbour as "system location" for
Harbour, following Lorenzo's advice.
2009-12-19 13:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/sha2.c
! Added trick to make it compile with Pelles C 6.00.6.

2
harbour/config/global.mk
View File

@@ -1233,7 +1233,7 @@ ifeq ($(HB_PLATFORM),beos)
HB_SYSLOC := yes
endif
else ifneq ($(HB_PLATFORM_UNIX),)
ifneq ($(strip $(foreach dir,/usr/local/bin /usr/bin /opt/harbour /opt/bin $(subst :, ,$(LD_LIBRARY_PATH)),$(findstring |$(dir),|$(HB_INSTALL_PREFIX)))),)
ifneq ($(strip $(foreach dir,/usr/local/bin /usr/bin $(subst :, ,$(LD_LIBRARY_PATH)),$(findstring |$(dir),|$(HB_INSTALL_PREFIX)))),)
HB_SYSLOC := yes
endif
endif

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

@@ -1145,8 +1145,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
ELSE
lSysLoc := LEFTEQUAL( l_cHB_BIN_INSTALL, "/usr/local/bin" ) .OR. ;
LEFTEQUAL( l_cHB_BIN_INSTALL, "/usr/bin" ) .OR. ;
LEFTEQUAL( l_cHB_BIN_INSTALL, "/opt/harbour" ) .OR. ;
LEFTEQUAL( l_cHB_BIN_INSTALL, "/opt/bin" ) .OR. ;
AScan( ListToArray( GetEnv( "LD_LIBRARY_PATH" ), ":" ), {| tmp | LEFTEQUAL( l_cHB_LIB_INSTALL, tmp ) } ) > 0
ENDIF
#else