Loading

Paste #pa5zphd3b

Wrap Raw Revise
  1. diff --git a/Makefile b/Makefile
  2. --- a/Makefile
  3. +++ b/Makefile
  4. @@ -118,7 +118,7 @@ GIT            ?= git
  5.  PYTHON         ?= python
  6.  
  7.  UNIX2DOS       ?= unix2dos
  8. -UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "")
  9. +UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null 1>& 2 && echo "-q" || echo "")
  10.  
  11.  ################################################################
  12.  # Get the Repository revision, tags and the modified status
  13. @@ -193,7 +193,7 @@ ifdef GFX_SCRIPT_LIST_FILES
  14.  # include dependency file, if we generate graphics
  15.  -include Makefile_gfx.dep
  16.  
  17. -GIMP           ?= "$(shell [ `which gimp 2>/dev/null` ] && echo "gimp" || echo "")"
  18. +GIMP           ?= "$(shell [ `which gimp 2>/dev/null 1>&2` ] && echo "gimp" || echo "")"
  19.  GIMP_FLAGS     ?= -n -i -b - <
  20.  
  21.  %.scm: $(SCRIPT_DIR)/gimpscript $(SCRIPT_DIR)/gimp.sed
  22. @@ -205,7 +205,7 @@ GIMP_FLAGS     ?= -n -i -b - <
  23.  # create the png file. And make sure it's re-created even when present in the repo
  24.  %.png: %.scm
  25.         $(_E) "[GIMP] $@"
  26. -       $(_V) $(GIMP) $(GIMP_FLAGS) $< >/dev/null
  27. +       $(_V) $(GIMP) $(GIMP_FLAGS) $< >/dev/null 2>&1
  28.  
  29.  Makefile_gfx.dep: $(GFX_SCRIPT_LIST_FILES) Makefile
  30.         $(_E) "[GFX-DEP] $@"
  31. @@ -219,7 +219,7 @@ Makefile_gfx.dep: $(GFX_SCRIPT_LIST_FILE
  32.         $(_V) echo -e "" >> Makefile_gfx
  33.         $(_V) echo -e '%.png: %.scm' >> Makefile_gfx
  34.         $(_V) echo -e '\t$(_E) [GIMP] $$@' >> Makefile_gfx
  35. -       $(_V) echo -e '\t$(_V) $(GIMP) $(GIMP_FLAGS) $$< >/dev/null' >> Makefile_gfx
  36. +       $(_V) echo -e '\t$(_V) $(GIMP) $(GIMP_FLAGS) $$< >/dev/null 2>&1' >> Makefile_gfx
  37.         $(_V) echo -e "" >> Makefile_gfx
  38.         $(_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
  39.         $(_V) echo -e "`cat $(GFX_SCRIPT_LIST_FILES) | grep \"\([pP][cCnN][xXgG]\)\" | grep -v \"^#\" | $(AWK) '{print $1": "$2}'`" >> Makefile_gfx
  40. @@ -401,7 +401,7 @@ bundle_tar: $(DIR_NAME).tar
  41.  bundle_zip: $(ZIP_FILENAME)
  42.  %.zip: $(DIR_NAME).tar
  43.         $(_E) "[BUNDLE ZIP] $@"
  44. -       $(_V) $(ZIP) $(ZIP_FLAGS) $@ $< >/dev/null
  45. +       $(_V) $(ZIP) $(ZIP_FLAGS) $@ $< >/dev/null 2>&1
  46.  bundle_bzip: $(DIR_NAME).tar.bz2
  47.  %.tar.bz2: %.tar
  48.         $(_E) "[BUNDLE BZIP] $@"
Posted by Anonymous at 14 Feb 2015, 12:04:12 UTC
Language: diff • Views: 699

Comments