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

[bdwalton at users.sourceforge.net]

Revision: 13956
          http://gar.svn.sourceforge.net/gar/?rev=13956&view=rev
Author:   bdwalton
Date:     2011-03-27 21:52:59 +0000 (Sun, 27 Mar 2011)

Log Message:
-----------
php5/trunk: import httpd.conf for apache1 and apache2...cannot figure out how to make it install the apache module files without having these files in the proper locations

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-03-27 20:17:31 UTC (rev 13955)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-03-27 21:52:59 UTC (rev 13956)
@@ -24,7 +24,7 @@
 VENDOR_URL     = http://www.php.net/
 MASTER_SITES   = http://us.php.net/distributions/
 INSTALL_ENV   += INSTALL_ROOT=$(DESTDIR)
-STRIP_DIRS    := $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/
+#STRIP_DIRS    := $(shell $(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)/*/
 
 LICENSE = LICENSE
 
@@ -548,7 +548,6 @@
 CONFIGURE_ARGS += --disable-static
 CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin
 CONFIGURE_ARGS += --enable-cli
-CONFIGURE_ARGS += --with-apxs2=/opt/csw/apache2/sbin/apxs
 CONFIGURE_ARGS += --with-mm=$(prefix)
 CONFIGURE_ARGS += --enable-magic-quotes
 CONFIGURE_ARGS += --with-pcre-regex
@@ -721,3 +720,14 @@
 
 include files/scripts.mk
 include gar/category.mk
+
+# 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) )
+	@$(MAKECOOKIE)


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