[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] =?utf-8?q?svn:_/php/php-src/_branches/PHP=5F5=5F3/sapi/fpm/Makefile.frag_trunk/sapi/fpm/Ma
From:       Jérôme_Loyet <fat () php ! net>
Date:       2010-05-29 22:00:43
Message-ID: svn-fat-1275170443-299942-436923313 () svn ! php ! net
[Download RAW message or body]

fat                                      Sat, 29 May 2010 22:00:43 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=299942

Log:
fix commit 299383

Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/fpm/Makefile.frag
    U   php/php-src/trunk/sapi/fpm/Makefile.frag

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/Makefile.frag
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/Makefile.frag	2010-05-29 21:55:19 UTC (rev 299941)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/Makefile.frag	2010-05-29 22:00:43 UTC (rev 299942)
@@ -1,9 +1,9 @@
 fpm: $(SAPI_FPM_PATH)

-fpm-subdir:
+$(builddir)/fpm:
 	@mkdir -p $(builddir)/fpm

-$(SAPI_FPM_PATH): fpm-subdir $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
 	$(BUILD_FPM)

 $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h

Modified: php/php-src/trunk/sapi/fpm/Makefile.frag
===================================================================
--- php/php-src/trunk/sapi/fpm/Makefile.frag	2010-05-29 21:55:19 UTC (rev 299941)
+++ php/php-src/trunk/sapi/fpm/Makefile.frag	2010-05-29 22:00:43 UTC (rev 299942)
@@ -1,9 +1,9 @@
 fpm: $(SAPI_FPM_PATH)

-fpm-subdir:
+$(builddir)/fpm:
 	@mkdir -p $(builddir)/fpm

-$(SAPI_FPM_PATH): fpm-subdir $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
 	$(BUILD_FPM)

 $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]