null+****@clear*****
null+****@clear*****
2012年 7月 8日 (日) 15:14:17 JST
Kouhei Sutou 2012-07-08 15:14:17 +0900 (Sun, 08 Jul 2012) New Revision: d415444c2ae364c4038e9879ec4d4329bc22b479 https://github.com/groonga/groonga/commit/d415444c2ae364c4038e9879ec4d4329bc22b479 Log: groonga-httpd: support other directory build Modified files: groonga-httpd-conf.sh.in vendor/Makefile.am vendor/nginx/configure Modified: groonga-httpd-conf.sh.in (+1 -2) =================================================================== --- groonga-httpd-conf.sh.in 2012-07-08 14:39:28 +0900 (c1a73f9) +++ groonga-httpd-conf.sh.in 2012-07-08 15:14:17 +0900 (4314f7c) @@ -6,8 +6,7 @@ sysconfdir="@sysconfdir@" pkgsysconfdir="@pkgsysconfdir@" localstatedir="@localstatedir@" -export GROONGA_HTTPD_MODULE_PATH="@abs_top_builddir@/src/nginx-module" -export GROONGA_HTTPD_LIBS="@groonga_libs@" +export GROONGA_HTTPD_MODULE_PATH="@abs_top_srcdir@/src/nginx-module" export GROONGA_HTTPD_RPATH="${libdir}" export GROONGA_HTTPD_IN_TREE_INCLUDE_PATH="@abs_top_builddir@/include" export GROONGA_HTTPD_IN_TREE_LINK_PATH="@abs_top_builddir@/lib/.libs" Modified: vendor/Makefile.am (+2 -1) =================================================================== --- vendor/Makefile.am 2012-07-08 14:39:28 +0900 (ee89e12) +++ vendor/Makefile.am 2012-07-08 15:14:17 +0900 (799abda) @@ -9,7 +9,8 @@ NGINX_MAKEILE = $(NGINX_DIR)/Makefile $(NGINX_MAKEILE): $(NGINX_DIR)/configure Makefile.am ../config.status (cd .. && \ - vendor/$(top_srcdir)/vendor/nginx/configure `./config.status --config`) + $(SHELL) $(abs_top_srcdir)/vendor/nginx/configure \ + `./config.status --config`) all-local: $(NGINX_MAKEILE) (cd $(NGINX_DIR) && $(MAKE) build) Modified: vendor/nginx/configure (+14 -5) =================================================================== --- vendor/nginx/configure 2012-07-08 14:39:28 +0900 (632568a) +++ vendor/nginx/configure 2012-07-08 15:14:17 +0900 (39c084c) @@ -1,13 +1,22 @@ +#!/bin/sh + set -e -cd $(dirname $0) -base_dir="$(pwd)" -top_dir="$base_dir/../.." +nginx_version=1.2.1 export GROONGA_HTTPD_IN_TREE=yes -source "${top_dir}/groonga-httpd-conf.sh" +. "./groonga-httpd-conf.sh" + +echo "$0" +source_directory="`dirname \"$0\"`" +absolute_source_directory="`cd \"$source_directory\"/../.. && pwd`" + +if [ "$absolute_source_directory" != "`pwd`" ]; then + rm -rf vendor/nginx-${nginx_version} + cp -rp "$absolute_source_directory/vendor/nginx-${nginx_version}" vendor/ +fi -cd ../nginx-1.2.1/ +cd "vendor/nginx-${nginx_version}" ./configure \ --prefix="${GROONGA_HTTPD_PREFIX}" \ -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...下载
