From 12969458bf871a788cfc253338d7c2f3bdd09906 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 22 Aug 2009 12:52:00 +0000 Subject: [PATCH] 2009-08-22 14:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk + Display MAKESHELL value if set. * config/globsh.mk * Updated OS/2 GNU tools information: os2-cp.exe requires *forward* slashes in filenames. --- harbour/ChangeLog | 8 ++++++++ harbour/config/global.mk | 2 +- harbour/config/globsh.mk | 7 +++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7e5a0ced0f..ab29232276 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-22 14:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/global.mk + + Display MAKESHELL value if set. + + * config/globsh.mk + * Updated OS/2 GNU tools information: os2-cp.exe requires + *forward* slashes in filenames. + 2009-08-22 14:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk % Minor opt. diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 2ca8c6dc18..013d348a0a 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -252,7 +252,7 @@ ifeq ($(HB_INIT_DONE),) # Macros: # -DHB_PCRE_REGEX, -DHB_POSIX_REGEX, -DHB_EXT_ZLIB, -DHB_HAS_GPM - $(info ! MAKE: $(MAKE) $(MAKE_VERSION) $(HB_MAKECMDGOALS) $(MAKEFLAGS) $(SHELL)) + $(info ! MAKE: $(MAKE) $(MAKE_VERSION) $(HB_MAKECMDGOALS) $(MAKEFLAGS) $(SHELL) $(if $(MAKESHELL), MAKESHELL: $(MAKESHELL),)) ifneq ($(HB_USER_PRGFLAGS),) $(info ! HB_USER_PRGFLAGS: $(HB_USER_PRGFLAGS)) endif diff --git a/harbour/config/globsh.mk b/harbour/config/globsh.mk index 08d1f532d7..c58dd74868 100644 --- a/harbour/config/globsh.mk +++ b/harbour/config/globsh.mk @@ -120,10 +120,9 @@ endif ifeq ($(HB_SHELL),os2) -# NOTE: Comment on included GNU tools: -# os2-mkdir expects forward slashes, while -# os2-rm and os2-cp expects backslashes in filenames. -# [vszakats] +# NOTE: Comment on included OS/2 GNU tools: +# os2-mkdir and os2-cp expects forward slashes, while +# os2-rm expects backslashes in filenames. [vszakats] MK := $(subst \,/,$(MAKE)) RM := $(TOOL_DIR)os2-rm -f