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

* utils/hbmk2/hbmk2.prg
    * On *nix platform hbmk.cfg is now first checked for
      in /usr/local/etc, then in /etc and after that in
      hbmk2's dir. Please advise if there are other such 
      global config dirs to check on different platforms.
This commit is contained in:
Viktor Szakats
2009-02-24 21:53:34 +00:00
parent 4de3d9252a
commit 4dd79912df
2 changed files with 17 additions and 1 deletions

View File

@@ -8,6 +8,13 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-24 22:52 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
* On *nix platform hbmk.cfg is now first checked for
in /usr/local/etc, then in /etc and after that in
hbmk2's dir. Please advise if there are other such
global config dirs to check on different platforms.
2009-02-24 22:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* harbour-win-spec
* harbour-wce-spec

View File

@@ -2048,6 +2048,14 @@ STATIC PROCEDURE HBP_ProcessAll( lConfigOnly,;
LOCAL aCFGDirs := { hb_DirBase() }
#if defined( __PLATFORM__WINDOWS ) .OR. ;
defined( __PLATFORM__DOS ) .OR. ;
defined( __PLATFORM__OS2 )
aCFGDirs := { hb_DirBase() }
#else
aCFGDirs := { "/usr/local/etc", "/etc", hb_DirBase() }
#endif
FOR EACH cDir IN aCFGDirs
IF hb_FileExists( cFileName := ( DirAddPathSep( cDir ) + HBMK_CFG_NAME ) )
IF t_lInfo
@@ -2552,7 +2560,8 @@ STATIC PROCEDURE ShowHelp( lLong )
" - Regular Harbour options are also accepted." ,;
" - Multiple -l, -L and <script> parameters are accepted." ,;
" - " + HBMK_CFG_NAME + " option file in hbmk directory is always processed if it" ,;
" exists. The format is the same as for .hbp files." ,;
" exists. On *nix platforms, /usr/local/etc then /etc are checked" ,;
" before the hbmk directory. The file format is .hbp." ,;
" - .hbp option files in current dir are automatically processed." ,;
" - .hbp options (they should come in separate lines):" ,;
" libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags]" ,;