diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -118,7 +118,7 @@ GIT ?= git PYTHON ?= python UNIX2DOS ?= unix2dos -UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "") +UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null 1>& 2 && echo "-q" || echo "") ################################################################ # Get the Repository revision, tags and the modified status @@ -193,7 +193,7 @@ ifdef GFX_SCRIPT_LIST_FILES # include dependency file, if we generate graphics -include Makefile_gfx.dep -GIMP ?= "$(shell [ `which gimp 2>/dev/null` ] && echo "gimp" || echo "")" +GIMP ?= "$(shell [ `which gimp 2>/dev/null 1>&2` ] && echo "gimp" || echo "")" GIMP_FLAGS ?= -n -i -b - < %.scm: $(SCRIPT_DIR)/gimpscript $(SCRIPT_DIR)/gimp.sed @@ -205,7 +205,7 @@ GIMP_FLAGS ?= -n -i -b - < # create the png file. And make sure it's re-created even when present in the repo %.png: %.scm $(_E) "[GIMP] $@" - $(_V) $(GIMP) $(GIMP_FLAGS) $< >/dev/null + $(_V) $(GIMP) $(GIMP_FLAGS) $< >/dev/null 2>&1 Makefile_gfx.dep: $(GFX_SCRIPT_LIST_FILES) Makefile $(_E) "[GFX-DEP] $@" @@ -219,7 +219,7 @@ Makefile_gfx.dep: $(GFX_SCRIPT_LIST_FILE $(_V) echo -e "" >> Makefile_gfx $(_V) echo -e '%.png: %.scm' >> Makefile_gfx $(_V) echo -e '\t$(_E) [GIMP] $$@' >> Makefile_gfx - $(_V) echo -e '\t$(_V) $(GIMP) $(GIMP_FLAGS) $$< >/dev/null' >> Makefile_gfx + $(_V) echo -e '\t$(_V) $(GIMP) $(GIMP_FLAGS) $$< >/dev/null 2>&1' >> Makefile_gfx $(_V) echo -e "" >> Makefile_gfx $(_V) for j in $(GFX_SCRIPT_LIST_FILES); do for i in `cat $$j | grep "\([pP][cCnN][xXgG]\)" | grep -v "^#" | cut -d\ -f1`; do echo "gimp: $$i" >> Makefile_gfx; done; done $(_V) echo -e "`cat $(GFX_SCRIPT_LIST_FILES) | grep \"\([pP][cCnN][xXgG]\)\" | grep -v \"^#\" | $(AWK) '{print $1": "$2}'`" >> Makefile_gfx @@ -401,7 +401,7 @@ bundle_tar: $(DIR_NAME).tar bundle_zip: $(ZIP_FILENAME) %.zip: $(DIR_NAME).tar $(_E) "[BUNDLE ZIP] $@" - $(_V) $(ZIP) $(ZIP_FLAGS) $@ $< >/dev/null + $(_V) $(ZIP) $(ZIP_FLAGS) $@ $< >/dev/null 2>&1 bundle_bzip: $(DIR_NAME).tar.bz2 %.tar.bz2: %.tar $(_E) "[BUNDLE BZIP] $@"