[csw-devel] SF.net SVN: gar:[14378] csw/mgar/pkg/php5/trunk/Makefile

[bdwalton at users.sourceforge.net]

Revision: 14378
          http://gar.svn.sourceforge.net/gar/?rev=14378&view=rev
Author:   bdwalton
Date:     2011-04-22 12:47:38 +0000 (Fri, 22 Apr 2011)

Log Message:
-----------
php5/trunk: set merge rules for the modulated build

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-04-22 00:56:37 UTC (rev 14377)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-22 12:47:38 UTC (rev 14378)
@@ -20,6 +20,8 @@
 
 EXTRA_MODULATORS = SAPI
 MODULATIONS_SAPI = cgi ap2
+MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all
+MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all
 
 # turn on the build scripts to enable/disable modules
 PHP5_EXT = 1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.