null+****@clear*****
null+****@clear*****
2012年 7月 9日 (月) 17:52:12 JST
Kouhei Sutou 2012-07-09 17:52:12 +0900 (Mon, 09 Jul 2012) New Revision: e54fa4b07fde8cf5de2e6aec5169bb199e4eeca3 https://github.com/groonga/groonga/commit/e54fa4b07fde8cf5de2e6aec5169bb199e4eeca3 Log: groonga-httpd: fix configure failure Modified files: vendor/Makefile.am vendor/nginx/configure Modified: vendor/Makefile.am (+2 -2) =================================================================== --- vendor/Makefile.am 2012-07-09 15:42:20 +0900 (556e0f1) +++ vendor/Makefile.am 2012-07-09 17:52:12 +0900 (624e01a) @@ -13,9 +13,9 @@ NGINX_MAKEFILE_DEPEND_FILES = \ $(top_srcdir)/src/nginx-module/config $(NGINX_MAKEILE): $(NGINX_MAKEFILE_DEPEND_FILES) - (cd "$(top_builddir)" && \ + (cd nginx && \ $(SHELL) "$(abs_top_srcdir)/vendor/nginx/configure" \ - `./config.status --config`) + `../../config.status --config`) all-local: $(NGINX_MAKEILE) (cd $(NGINX_DIR) && $(MAKE) build) Modified: vendor/nginx/configure (+2 -2) =================================================================== --- vendor/nginx/configure 2012-07-09 15:42:20 +0900 (39c084c) +++ vendor/nginx/configure 2012-07-09 17:52:12 +0900 (db70b5b) @@ -5,7 +5,7 @@ set -e nginx_version=1.2.1 export GROONGA_HTTPD_IN_TREE=yes -. "./groonga-httpd-conf.sh" +. "../../groonga-httpd-conf.sh" echo "$0" source_directory="`dirname \"$0\"`" @@ -16,7 +16,7 @@ if [ "$absolute_source_directory" != "`pwd`" ]; then cp -rp "$absolute_source_directory/vendor/nginx-${nginx_version}" vendor/ fi -cd "vendor/nginx-${nginx_version}" +cd "../nginx-${nginx_version}" ./configure \ --prefix="${GROONGA_HTTPD_PREFIX}" \ -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...下载
