unix2dos_fix.diff

Don't use -q option with unix2dos if the option is not present. - Terkhen, 2010-09-08 21:34

Download (1.15 KB)

View differences:

scripts/Makefile.common Wed Sep 08 21:24:33 2010 +0200
33 33
test::
34 34
	$(_E) "Make:                         $(MAKE)"
35 35
	$(_E) "MD5sum:                       $(MD5SUM)"
36
	$(_E) "unix2dos:                     $(UNIX2DOS)"
36
	$(_E) "unix2dos:                     $(UNIX2DOS) $(UNIX2DOS_FLAGS)"
37 37
	$(_E) "gcc:                          $(CC) $(CC_FLAGS)"
38 38
	$(_E) "zip:                          $(ZIP) $(ZIP_FLAGS)"
39 39
	$(_E) "bzip:                         $(BZIP) $(BZIP_FLAGS)"
scripts/Makefile.def Wed Sep 08 21:24:33 2010 +0200
25 25
BZIP_FLAGS     ?= -k9f
26 26
CC_FLAGS       ?= -C -E - <
27 27
MAKE_FLAGS     ?=
28
UNIX2DOS_FLAGS ?= -q
28
UNIX2DOS_FLAGS ?= $(shell $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "")
29 29
NML_FLAGS      ?=
30 30
# OSX has nice extended file attributes which create their own file within tars. We don't want those, thus don't copy them
31 31
CP_FLAGS       ?= $(shell [ "$(OSTYPE)" = "Darwin" ] && echo "-rfX" || echo "-rf")