Mercurial > hg > nginx
diff misc/GNUmakefile @ 4847:0275f587e00b stable-1.2
Merge of r4777, r4780, r4831, r4832: release process changes.
*) Simplified makefile that builds CHANGES.
*) Removed the need in Perl to generate ZIP archive of nginx/Windows.
*) Converted DOS-style newlines in dump.xslt.
*) Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 24 Sep 2012 18:30:26 +0000 |
| parents | 488698c39bfa |
| children | 026ff0eb3062 |
line wrap: on
line diff
--- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -93,7 +93,7 @@ zip: mkdir -p $(TEMP)/$(NGINX)/temp svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/ - perl -pi -e 's/$$/\r/' $(TEMP)/$(NGINX)/conf/* + sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/* svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/ svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/ @@ -112,7 +112,7 @@ zip: cp -p $(OBJS)/lib/$(PCRE)/LICENCE \ $(TEMP)/$(NGINX)/docs/PCRE.LICENCE - perl -ne 'print if /^ \(C\) 1995-20/ .. /^ jloup\@gzip.org/' \ + sed -ne '/^ (C) 1995-20/,/^ jloup@gzip\.org/p' \ $(OBJS)/lib/$(ZLIB)/README \ > $(TEMP)/$(NGINX)/docs/zlib.LICENSE