diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 72b1494269..fb038862ab 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,18 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-25 18:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/global.mk + + Added SVN revision detection and display in log header. + Will kick in only if svn is installed. For non-live SVN + sandboxes (exported/nightly/other dl) it will display + 'exported'. It will also show if there was any local + modifications done by appending an 'M' to revno. + * TOFIX -> NOTE + + * source/Makefile + % Minor to recent. + 2009-08-25 17:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk + Added dos/djgpp autodetection for *nix platforms. diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 5e34dfdfc2..a632a98bc5 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -24,8 +24,8 @@ # http://cvs.savannah.gnu.org/viewvc/make/NEWS?root=make&view=markup # --------------------------------------------------------------- -# TOFIX: $(realpath/abspath) need GNU Make 3.81 or upper -# TOFIX: $(eval) needs GNU Make 3.80 or upper +# NOTE: $(realpath/abspath) need GNU Make 3.81 or upper +# NOTE: $(eval) needs GNU Make 3.80 or upper ifeq ($(GLOBAL_CF_),) GLOBAL_CF_ := yes @@ -1226,10 +1226,15 @@ endif export HB_INSTALL_PREFIX -ifneq ($(HB_INSTALL_PREFIX_ORI),$(HB_INSTALL_PREFIX)) - ifneq ($(MAKE_381),) +ifneq ($(MAKE_381),) + ifneq ($(HB_INSTALL_PREFIX_ORI),$(HB_INSTALL_PREFIX)) $(info ! HB_INSTALL_PREFIX automatically set to: $(HB_INSTALL_PREFIX)) endif + ifeq ($(ROOT),./) + ifneq ($(call find_in_path,svnversion),) + $(info ! REVISION: $(shell svnversion)) + endif + endif endif ifneq ($(HB_INSTALL_PREFIX),) diff --git a/harbour/source/Makefile b/harbour/source/Makefile index 58bba7facd..6fa10d373b 100644 --- a/harbour/source/Makefile +++ b/harbour/source/Makefile @@ -82,7 +82,7 @@ else ifeq ($(HB_PLATFORM),dos) # Don't consume environment space - DYNDIRLIST_BASE = x + DYNDIRLIST_BASE := x endif ifeq ($(HB_PLATFORM),os2) DYNDIRLIST_BASE += source/rtl/gtos2