[Groonga-commit] groonga/groonga [master] groonga-httpd: support auto reconfigure

Back to archive index

null+****@clear***** null+****@clear*****
2012年 7月 8日 (日) 14:34:06 JST


Kouhei Sutou	2012-07-08 14:34:06 +0900 (Sun, 08 Jul 2012)

  New Revision: 2b519a0fee35eaacba72ac58520901e43b42701f
  https://github.com/groonga/groonga/commit/2b519a0fee35eaacba72ac58520901e43b42701f

  Log:
    groonga-httpd: support auto reconfigure

  Modified files:
    vendor/Makefile.am

  Modified: vendor/Makefile.am (+13 -5)
===================================================================
--- vendor/Makefile.am    2012-07-06 17:37:13 +0900 (d327e00)
+++ vendor/Makefile.am    2012-07-08 14:34:06 +0900 (ee89e12)
@@ -3,11 +3,19 @@
 # So, override the all rule.
 
 if WITH_NGINX
-all-local:
-	(cd nginx-1.2.1 && $(MAKE) build)
+NGINX_DIR = nginx-1.2.1
 
-install-exec-local:
-	(cd nginx-1.2.1 && $(MAKE) install)
+NGINX_MAKEILE = $(NGINX_DIR)/Makefile
+
+$(NGINX_MAKEILE): $(NGINX_DIR)/configure Makefile.am ../config.status
+	(cd .. && \
+	  vendor/$(top_srcdir)/vendor/nginx/configure `./config.status --config`)
+
+all-local: $(NGINX_MAKEILE)
+	(cd $(NGINX_DIR) && $(MAKE) build)
+
+install-exec-local: $(NGINX_MAKEILE)
+	(cd $(NGINX_DIR) && $(MAKE) install)
 endif
 
-EXTRA_DIST = nginx nginx-1.2.1
+EXTRA_DIST = nginx $(NGINX_DIR)
-------------- next part --------------
HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...
下载 



Groonga-commit メーリングリストの案内
Back to archive index