diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8cc392daf0..3bd70c4616 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-11 18:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/dos/dir.cf + * config/win/global.cf + * config/win/dir.cf + * config/wce/dir.cf + * Some more sync. Now os2/win/wce dir.cfs are the same, + and they're almost the same as the dos one. + 2009-07-11 17:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/dos/dir.cf * config/dos/install.cf diff --git a/harbour/config/dos/dir.cf b/harbour/config/dos/dir.cf index 273b387b2c..b5c7acd996 100644 --- a/harbour/config/dos/dir.cf +++ b/harbour/config/dos/dir.cf @@ -25,6 +25,7 @@ DIR_MAKE = $(subst /,\,$(MK)) DIR_RULE = $(foreach file, $(DIR_LIST), $(dir_mk)) else # bash + DIR_LIST = $(subst \,/,$(DIRS)) DIR_RULE =\ @for d in $(DIR_LIST); do \ diff --git a/harbour/config/wce/dir.cf b/harbour/config/wce/dir.cf index 0d2f62f9c7..ffcc881643 100644 --- a/harbour/config/wce/dir.cf +++ b/harbour/config/wce/dir.cf @@ -4,15 +4,17 @@ ifeq ($(PM),) # Only traverse directories if not compiling a specific module +ifeq ($(DIRS),) # Empty directory list + +DIR_RULE = @echo Done + +else + ifeq ($(SHLVL),) # non-bash -ifeq ($(DIRS),) # Empty directory list -DIR_RULE = @echo Done -else -DIR_LIST = $(subst /,\,$(DIRS)) DIR_MAKE = $(subst /,\,$(MK)) +DIR_LIST = $(subst /,\,$(DIRS)) DIR_RULE = $(COMSPEC) /c for %d in ($(DIR_LIST)) do $(DIR_MAKE) -C %d $@ -endif # ! Empty directory list else # bash @@ -25,4 +27,6 @@ DIR_RULE =\ endif # ! non-bash +endif # ! Empty directory list + endif # ! compiling a specific program module diff --git a/harbour/config/win/dir.cf b/harbour/config/win/dir.cf index 0d2f62f9c7..ffcc881643 100644 --- a/harbour/config/win/dir.cf +++ b/harbour/config/win/dir.cf @@ -4,15 +4,17 @@ ifeq ($(PM),) # Only traverse directories if not compiling a specific module +ifeq ($(DIRS),) # Empty directory list + +DIR_RULE = @echo Done + +else + ifeq ($(SHLVL),) # non-bash -ifeq ($(DIRS),) # Empty directory list -DIR_RULE = @echo Done -else -DIR_LIST = $(subst /,\,$(DIRS)) DIR_MAKE = $(subst /,\,$(MK)) +DIR_LIST = $(subst /,\,$(DIRS)) DIR_RULE = $(COMSPEC) /c for %d in ($(DIR_LIST)) do $(DIR_MAKE) -C %d $@ -endif # ! Empty directory list else # bash @@ -25,4 +27,6 @@ DIR_RULE =\ endif # ! non-bash +endif # ! Empty directory list + endif # ! compiling a specific program module diff --git a/harbour/config/win/global.cf b/harbour/config/win/global.cf index 1086f15f05..356619a7eb 100644 --- a/harbour/config/win/global.cf +++ b/harbour/config/win/global.cf @@ -8,9 +8,9 @@ HB_GT_LIST=\ gtcgi \ gtpca \ gtstd \ - gtwin \ gtwvt \ gtgui \ + gtwin \ # gtcrs \ # gtsln \