use_dos2unix.diff

fanioz, 2010-09-24 18:40

Download (1.88 KB)

View differences:

scripts/Makefile.common
33 33
	$(_E) "Make:                         $(MAKE)"
34 34
	$(_E) "MD5sum:                       $(MD5SUM)"
35 35
	$(_E) "unix2dos:                     $(UNIX2DOS) $(UNIX2DOS_FLAGS)"
36
	$(_E) "dos2unix:                     $(DOS2UNIX) $(DOS2UNIX_FLAGS)"
36 37
	$(_E) "gcc:                          $(CC) $(CC_FLAGS)"
37 38
	$(_E) "zip:                          $(ZIP) $(ZIP_FLAGS)"
38 39
	$(_E) "bzip:                         $(BZIP) $(BZIP_FLAGS)"
scripts/Makefile.def
26 26
CC_FLAGS       ?= -C -E - <
27 27
MAKE_FLAGS     ?=
28 28
UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "")
29
DOS2UNIX_FLAGS ?= $(shell [ -n $(DOS2UNIX) ] && $(DOS2UNIX) -U --version 2>/dev/null && echo "-U" || echo "")
29 30
NML_FLAGS      ?=
30 31
# OSX has nice extended file attributes which create their own file within tars. We don't want those, thus don't copy them
31 32
CP_FLAGS       ?= $(shell [ "$(OSTYPE)" = "Darwin" ] && echo "-rfX" || echo "-rf")
......
43 44
HG             ?= hg
44 45
MAKE           ?= make
45 46
UNIX2DOS       ?= $(shell [ `which unix2dos 2>/dev/null` ] && echo "unix2dos" || echo "")
47
DOS2UNIX       ?= $(shell [ `which dos2unix 2>/dev/null` ] && echo "dos2unix" || echo "")
46 48
# Macs have a different md5 command than linux or mingw envirnoment:
47 49
MD5SUM         ?= $(shell [ "$(OSTYPE)" = "Darwin" ] && echo "md5 -r" || echo "md5sum")
48 50
NML            ?= nmlc
scripts/Makefile_nml
24 24

  
25 25
%.grf: %.nml $(REV_FILENAME) $(TAG_FILENAME)
26 26
	$(_E) "[NML] $@"
27
	$(_V) $(DOS2UNIX) $(DOS2UNIX_FLAGS) $<
27 28
	$(_V) $(NML) $(NML_FLAGS) --grf $@ $<
28 29

  
29 30
endif # project_type == NML