diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ba465089b1..d0ce5508bd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-16 03:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/instsh.cf + * config/dirsh.cf + * config/globsh.cf + % Using $(CMDPREF) instead of '$(COMSPEC) /C'. + 2009-07-16 02:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) - config/hpux/dir.cf * config/hpux/global.cf diff --git a/harbour/config/dirsh.cf b/harbour/config/dirsh.cf index 3d9261535a..e063b100ef 100644 --- a/harbour/config/dirsh.cf +++ b/harbour/config/dirsh.cf @@ -24,7 +24,7 @@ MK_OS = $(subst /,\,$(MK)) DIRS_OS = $(subst /,\,$(DIRS)) DIR_RULE =\ - $(COMSPEC) /C for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@ + $(CMDPREF)for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@ else ifeq ($(HB_SHELL),os2) @@ -32,7 +32,7 @@ MK_OS = $(subst /,\,$(MK)) DIRS_OS = $(subst /,\,$(DIRS)) DIR_RULE =\ - $(COMSPEC) /C for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@ + $(CMDPREF)for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@ else ifeq ($(HB_SHELL),dos) diff --git a/harbour/config/globsh.cf b/harbour/config/globsh.cf index 28529f88cd..5059030582 100644 --- a/harbour/config/globsh.cf +++ b/harbour/config/globsh.cf @@ -33,19 +33,19 @@ EXE_FILE_OS = $(subst /,\,$(EXE_FILE)) MK = $(subst \,/,$(subst \~,~,$(MAKE))) RM = del /q /f RD = rmdir /q /s -CP = $(COMSPEC) /c copy +CP = $(CMDPREF)copy MV = move MD = mkdir dirbase:: - -@$(COMSPEC) /c if not exist $(OBJ_DIR_OS) $(MD) $(OBJ_DIR_OS) - $(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS) $(MD) $(LIB_DIR_OS),) - $(if $(EXE_DIR_OS),-@$(COMSPEC) /c if not exist $(EXE_DIR_OS) $(MD) $(EXE_DIR_OS),) + -@$(CMDPREF)if not exist $(OBJ_DIR_OS) $(MD) $(OBJ_DIR_OS) + $(if $(LIB_DIR_OS),-@$(CMDPREF)if not exist $(LIB_DIR_OS) $(MD) $(LIB_DIR_OS),) + $(if $(EXE_DIR_OS),-@$(CMDPREF)if not exist $(EXE_DIR_OS) $(MD) $(EXE_DIR_OS),) clean:: - -@$(COMSPEC) /c if exist $(OBJ_DIR_OS) $(RD) $(OBJ_DIR_OS) - $(if $(LIB_FILE_OS),-@$(COMSPEC) /c if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),) - $(if $(EXE_FILE_OS),-@$(COMSPEC) /c if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),) + -@$(CMDPREF)if exist $(OBJ_DIR_OS) $(RD) $(OBJ_DIR_OS) + $(if $(LIB_FILE_OS),-@$(CMDPREF)if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),) + $(if $(EXE_FILE_OS),-@$(CMDPREF)if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),) else ifeq ($(HB_SHELL),os2) @@ -99,19 +99,19 @@ endif MK = $(subst \,/,$(subst \~,~,$(MAKE))) RM = del RD = rmdir -CP = $(COMSPEC) /Ccopy +CP = $(CMDPREF)copy MV = move MD = md dirbase:: - -@$(COMSPEC) /Cfor %d in ($(OBJ_BASE) $(OBJ_ARCH_DIR_OS) $(OBJ_DIR_OS)) do if not exist %d\nul $(MD) %d - $(if $(LIB_FILE_OS),-@$(COMSPEC) /Cfor %d in ($(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d\nul $(MD) %d,) - $(if $(EXE_FILE_OS),-@$(COMSPEC) /Cfor %d in ($(EXE_ARCH_DIR_OS) $(EXE_DIR_OS)) do if not exist %d\nul $(MD) %d,) + -@$(CMDPREF)for %d in ($(OBJ_BASE) $(OBJ_ARCH_DIR_OS) $(OBJ_DIR_OS)) do if not exist %d\nul $(MD) %d + $(if $(LIB_FILE_OS),-@$(CMDPREF)for %d in ($(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d\nul $(MD) %d,) + $(if $(EXE_FILE_OS),-@$(CMDPREF)for %d in ($(EXE_ARCH_DIR_OS) $(EXE_DIR_OS)) do if not exist %d\nul $(MD) %d,) clean:: - -@$(COMSPEC) /Cfor %f in ($(OBJ_DIR_OS)\*.* *.bak *.obj *.o *.tds) do $(RM) %f - -@$(COMSPEC) /Cfor %d in ($(OBJ_DIR_OS) $(OBJ_ARCH_DIR_OS) $(OBJ_BASE)) do if exist %d\nul $(RD) %d - $(if $(LIB_FILE_OS),-@$(COMSPEC) /Cif exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),) - $(if $(EXE_FILE_OS),-@$(COMSPEC) /Cif exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),) + -@$(CMDPREF)for %f in ($(OBJ_DIR_OS)\*.* *.bak *.obj *.o *.tds) do $(RM) %f + -@$(CMDPREF)for %d in ($(OBJ_DIR_OS) $(OBJ_ARCH_DIR_OS) $(OBJ_BASE)) do if exist %d\nul $(RD) %d + $(if $(LIB_FILE_OS),-@$(CMDPREF)if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),) + $(if $(EXE_FILE_OS),-@$(CMDPREF)if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),) endif diff --git a/harbour/config/instsh.cf b/harbour/config/instsh.cf index 7446764489..f243712901 100644 --- a/harbour/config/instsh.cf +++ b/harbour/config/instsh.cf @@ -36,7 +36,7 @@ INSTALL_DIR_OS = $(subst /,\,$(INSTALL_DIR)) INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES)) INSTALL_RULE =\ - -$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)" + -$(CMDPREF)for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)" else ifeq ($(HB_SHELL),os2) @@ -44,7 +44,7 @@ else ifeq ($(HB_SHELL),os2) # NOTE: The empty line directly before 'endef' HAVE TO exist! # It causes that every commands will be separated by LF define inst_file -$(COMSPEC) /C $(CP) $(file) $(subst /,\,$(INSTALL_DIR)) +$(CMDPREF)$(CP) $(file) $(subst /,\,$(INSTALL_DIR)) endef @@ -59,7 +59,7 @@ else ifeq ($(HB_SHELL),dos) # NOTE: The empty line directly before 'endef' HAVE TO exist! # It causes that every commands will be separated by LF define inst_file -$(COMSPEC) /Cxcopy /Y /I $(file) $(INSTALL_DIR_OS) +$(CMDPREF)xcopy /Y /I $(file) $(INSTALL_DIR_OS) endef