Mercurial > hg > nginx
comparison misc/GNUmakefile @ 4443:f9b3061e0f31 stable-1.0
Merge of r4393: zlib license file include fixed.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sun, 05 Feb 2012 19:03:21 +0000 |
parents | dc7549aa8556 |
children | 8cca7b5bd21f |
comparison
equal
deleted
inserted
replaced
4442:41b2d17534c1 | 4443:f9b3061e0f31 |
---|---|
110 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE | 110 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE |
111 | 111 |
112 cp -p $(OBJS)/lib/$(PCRE)/LICENCE \ | 112 cp -p $(OBJS)/lib/$(PCRE)/LICENCE \ |
113 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE | 113 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE |
114 | 114 |
115 perl -ne 'print if /^ \(C\) 1995-2004/ .. /^ jloup\@gzip.org/' \ | 115 perl -ne 'print if /^ \(C\) 1995-20/ .. /^ jloup\@gzip.org/' \ |
116 $(OBJS)/lib/$(ZLIB)/README \ | 116 $(OBJS)/lib/$(ZLIB)/README \ |
117 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE | 117 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE |
118 | 118 |
119 touch -r $(OBJS)/lib/$(ZLIB)/README \ | 119 touch -r $(OBJS)/lib/$(ZLIB)/README \ |
120 $(TEMP)/$(NGINX)/docs/zlib.LICENSE | 120 $(TEMP)/$(NGINX)/docs/zlib.LICENSE |