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

[bdwalton at users.sourceforge.net]

Revision: 14196
          http://gar.svn.sourceforge.net/gar/?rev=14196&view=rev
Author:   bdwalton
Date:     2011-04-14 22:15:08 +0000 (Thu, 14 Apr 2011)

Log Message:
-----------
php5/trunk: cleanup the way we handle apache2 install (remove legacy second build for it)

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile
    csw/mgar/pkg/php5/trunk/files/scripts.mk

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-04-14 20:27:18 UTC (rev 14195)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-14 22:15:08 UTC (rev 14196)
@@ -646,6 +646,7 @@
 CONFIGURE_ARGS += --enable-zip=shared
 CONFIGURE_ARGS += --with-zlib-dir=$(prefix)
 CONFIGURE_ARGS += --with-zlib=$(prefix)
+CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs
 
 # Disable Tests (report submitted to PHP QA)
 SKIPTEST = 1
@@ -719,16 +720,13 @@
 # this allows apxs to install the module.  stupid, but i couldn't make
 # the darn thing _not_ do try to add the httpd.conf lines, even with
 # patching...
-pre-install-modulated: APSYSCONF=/opt/csw/apache/conf
 pre-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc
 pre-install-modulated:
-	@(mkdir -p $(DESTDIR)$(AP2SYSCONF) $(DESTDIR)$(APSYSCONF); \
-		cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF); \
-		cp $(APSYSCONF)/httpd.conf $(DESTDIR)$(APSYSCONF) )
+	@(mkdir -p $(DESTDIR)$(AP2SYSCONF); \
+		cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) )
 	@$(MAKECOOKIE)
 
-# post-install-modulated: APSYSCONF=/opt/csw/apache/conf/httpd.conf
-# post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf
-# post-install-modulated:
-# 	@( rm $(DESTDIR)$(APSYSCONF) $(DESTDIR)$(AP2SYSCONF) )
-# 	@$(MAKECOOKIE)
+post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf
+post-install-modulated:
+	@rm $(DESTDIR)$(AP2SYSCONF)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/php5/trunk/files/scripts.mk
===================================================================
--- csw/mgar/pkg/php5/trunk/files/scripts.mk	2011-04-14 20:27:18 UTC (rev 14195)
+++ csw/mgar/pkg/php5/trunk/files/scripts.mk	2011-04-14 22:15:08 UTC (rev 14196)
@@ -15,7 +15,6 @@
 endef
 
 PI_SCRIPTS  = install-extras
-PI_SCRIPTS += install-ap2modphp5
 PI_SCRIPTS += install-cleanup
 
 post-install-modulated: $(PI_SCRIPTS)
@@ -37,14 +36,6 @@
 	gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW
 	@$(MAKECOOKIE)
 
-install-ap2modphp5:
-	@echo "[====> Now Installing ap2_modphp5 <====]"
-	$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
-	strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so
-	ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
-	ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra
-	@$(MAKECOOKIE)
-
 install-cleanup:
 	@echo "[====> Cleaning Up Extra Install Files <====]"
 	gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr


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