diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/nginx/Makefile | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/nginx/Makefile')
| -rw-r--r-- | package/nginx/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/nginx/Makefile b/package/nginx/Makefile index 5da12f51d..3565b65c7 100644 --- a/package/nginx/Makefile +++ b/package/nginx/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.5.12 PKG_RELEASE:= 1 PKG_MD5SUM:= c21589daaec0743d6d4cdf41503ffd53 PKG_DESCR:= powerful http reverse proxy and webserver -PKG_SECTION:= proxy +PKG_SECTION:= net/http PKG_BUILDDEP:= openssl pcre zlib PKG_DEPENDS:= libopenssl libpcre libpthread zlib PKG_URL:= http://nginx.org/ |