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

[valholla at users.sourceforge.net]

Revision: 4619
          http://gar.svn.sourceforge.net/gar/?rev=4619&view=rev
Author:   valholla
Date:     2009-04-30 15:00:05 +0000 (Thu, 30 Apr 2009)

Log Message:
-----------
fix apache modphp5

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_apache/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2009-04-30 12:56:13 UTC (rev 4618)
+++ csw/mgar/pkg/php5/trunk/Makefile	2009-04-30 15:00:05 UTC (rev 4619)
@@ -85,9 +85,6 @@
 SKIPTEST = 1
 ENABLE_CHECK = 0
 
-# SAPI Specific Rules
-STRIP_DIRS += $(DESTDIR)$(prefix)/apache2/libexec
-
 # Rebuild Configure Args to build mod_php5
 NEW_CONFIGURE_ARGS = $(shell echo $(CONFIGURE_ARGS) |sed -e 's/apxs2/apxs/' \
 		-e 's/apache2\/sbin\/apxs/apache\/bin\/apxs/')
@@ -115,6 +112,14 @@
 	@( strip $(DESTDIR)$(prefix)/apache/libexec/libphp5.so )
 	@( gfind $(DESTDIR)$(prefix)/apache*  \
 			-mindepth 1 -type d | grep -v libexec | xargs grm -fr )
+	@(ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra)
+	@(ginstall -m 0644 \
+		$(WORKDIR)/http-php5.conf.CSW \
+		$(DESTDIR)$(prefix)/apache2/etc/extra)
+	@(ginstall -d $(DESTDIR)$(prefix)/apache/etc/extra)
+	@(ginstall -m 0644 \
+		$(WORKDIR)/http-php5.conf.CSW \
+		$(DESTDIR)$(prefix)/apache/etc/extra)
 	@$(MAKECOOKIE)
 
 post-configure-modulated:

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_apache/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_apache/Makefile	2009-04-30 12:56:13 UTC (rev 4618)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_apache/Makefile	2009-04-30 15:00:05 UTC (rev 4619)
@@ -7,6 +7,8 @@
 REQUIRED_PKGS_CSWmodphp5  = CSWapache CSWiconv CSWexpat
 REQUIRED_PKGS_CSWmodphp5 += CSWlibxml2 CSWphp5 CSWzlib
 
+STRIP_DIRS += $(DESTDIR)$(prefix)/apache/libexec
+
 DISTFILES += CSWmodphp5.postinstall CSWmodphp5.preremove CSWmodphp5.space
 
 PKGFILES_CSWmodphp5 = .*/csw/apache/.*

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile	2009-04-30 12:56:13 UTC (rev 4618)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile	2009-04-30 15:00:05 UTC (rev 4619)
@@ -10,6 +10,8 @@
 DISTFILES += CSWap2modphp5.preremove httpd-php5.conf.CSW
 DISTFILES += CSWap2modphp5.postinstall CSWap2modphp5.space
 
+STRIP_DIRS += $(DESTDIR)$(prefix)/apache2/libexec
+
 CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs
 
 PKGFILES_CSWap2modphp5 = .*/csw/apache2/.*


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