tarball,crossplatform.mk: improve cross-platform shell command functions. let errors...

[sdk] / installer / Makefile

diff --git a/installer/Makefile b/installer/Makefile
index f99f05c..12ce23f 100644 (file)
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -5397,12 +5397,12 @@ endif
 all: objdir $(TARGET)
 
 objdir:
-       $(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
+       $(if $(wildcard $(OBJ)),,$(call mkdir,$(OBJ)))
        $(if $(ECERE_SDK_SRC),$(if $(wildcard $(call escspace,$(ECERE_SDK_SRC)/crossplatform.mk)),,@$(call echo,Ecere SDK Source Warning: The value of ECERE_SDK_SRC is pointing to an incorrect ($(ECERE_SDK_SRC)) location.)),)
        $(if $(ECERE_SDK_SRC),,$(if $(ECP_DEBUG)$(ECC_DEBUG)$(ECS_DEBUG),@$(call echo,ECC Debug Warning: Please define ECERE_SDK_SRC before using ECP_DEBUG, ECC_DEBUG or ECS_DEBUG),))
 
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
-       @$(call rmq,$(OBJ)symbols.lst)
+       @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
        @$(call echo,$(SYMBOLS)) >> $(OBJ)symbols.lst
        @$(call echo,$(IMPORTS)) >> $(OBJ)symbols.lst
@@ -5417,7 +5417,7 @@ $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
 $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RCSOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
-       @$(call rmq,$(OBJ)objects.lst)
+       @$(call rm,$(OBJ)objects.lst)
        @$(call touch,$(OBJ)objects.lst)
 ifdef WINDOWS_TARGET
        @$(call echo,$(RCOBJECTS)) >> $(OBJ)objects.lst
@@ -6210,32 +6210,32 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(call quote_path,$@)
 
 cleantarget: objdir
-       $(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
-       $(call rmq,$(OBJ)symbols.lst)
-       $(call rmq,$(OBJ)objects.lst)
-       $(call rmq,$(TARGET))
+       $(call rm,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+       $(call rm,$(OBJ)symbols.lst)
+       $(call rm,$(OBJ)objects.lst)
+       $(call rm,$(TARGET))
 ifdef SHARED_LIBRARY_TARGET
 ifdef LINUX_TARGET
 ifdef LINUX_HOST
-       $(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
-       $(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+       $(call rm,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+       $(call rm,$(OBJ)$(LP)$(MODULE)$(SO))
 endif
 endif
 endif
 
 clean: cleantarget
-       $(call rmq,$(_OBJECTS))
+       $(call rm,$(_OBJECTS))
 ifdef WINDOWS_TARGET
-       $(call rmq,$(_RCOBJECTS))
+       $(call rm,$(_RCOBJECTS))
 endif
-       $(call rmq,$(_ECOBJECTS))
-       $(call rmq,$(_COBJECTS))
-       $(call rmq,$(_BOWLS))
-       $(call rmq,$(_IMPORTS))
-       $(call rmq,$(_SYMBOLS))
+       $(call rm,$(_ECOBJECTS))
+       $(call rm,$(_COBJECTS))
+       $(call rm,$(_BOWLS))
+       $(call rm,$(_IMPORTS))
+       $(call rm,$(_SYMBOLS))
 
 realclean: cleantarget
-       $(call rmrq,$(OBJ))
+       $(call rmr,$(OBJ))
 
 distclean: cleantarget
-       $(call rmrq,obj/)
+       $(call rmr,obj/)