comparison auto/install @ 635:e67b227c8dbb default tip

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 428c6e58046a
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
72 esac 72 esac
73 73
74 74
75 cat << END >> $NGX_MAKEFILE 75 cat << END >> $NGX_MAKEFILE
76 76
77 manpage:
78 sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
79 -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
80 -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
81 -e "s|%%ERROR_LOG_PATH%%|$NGX_ERROR_LOG_PATH|" \\
82 < man/nginx.8 > $NGX_OBJS/nginx.8
83
77 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ 84 install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
78 $NGX_INSTALL_PERL_MODULES 85 $NGX_INSTALL_PERL_MODULES
79 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX' 86 test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
80 87
81 test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \ 88 test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \
102 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default' 109 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
103 110
104 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \ 111 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \
105 || cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX' 112 || cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
106 cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default' 113 cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default'
114
115 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params' \
116 || cp conf/uwsgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
117 cp conf/uwsgi_params \
118 '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params.default'
119
120 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params' \
121 || cp conf/scgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
122 cp conf/scgi_params \
123 '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params.default'
107 124
108 test -f '\$(DESTDIR)$NGX_CONF_PATH' \ 125 test -f '\$(DESTDIR)$NGX_CONF_PATH' \
109 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH' 126 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
110 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' 127 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
111 128
134 151
135 cat << END >> Makefile 152 cat << END >> Makefile
136 153
137 build: 154 build:
138 \$(MAKE) -f $NGX_MAKEFILE 155 \$(MAKE) -f $NGX_MAKEFILE
156 \$(MAKE) -f $NGX_MAKEFILE manpage
139 157
140 install: 158 install:
141 \$(MAKE) -f $NGX_MAKEFILE install 159 \$(MAKE) -f $NGX_MAKEFILE install
142 160
143 upgrade: 161 upgrade: