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

[bdwalton at users.sourceforge.net]

Revision: 14226
          http://gar.svn.sourceforge.net/gar/?rev=14226&view=rev
Author:   bdwalton
Date:     2011-04-16 02:16:29 +0000 (Sat, 16 Apr 2011)

Log Message:
-----------
php5/trunk: further clean up of the old postinstall stuff

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-04-16 02:08:58 UTC (rev 14225)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-16 02:16:29 UTC (rev 14226)
@@ -29,7 +29,7 @@
 LICENSE = LICENSE
 
 DISTFILES += $(DISTNAME).tar.bz2
-DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall
+DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall
 DISTFILES += CSWphp5.cswreleasenotes
 
 PATCHFILES += 0001-Strip-usr-ucblib-references.patch
@@ -742,22 +742,16 @@
 	@$(MAKECOOKIE)
 
 post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf
+post-install-modulated: INIDEST=$(DESTDIR)$(prefix)/php5/etc/php.ini.CSW
 post-install-modulated:
-	@rm $(DESTDIR)$(AP2SYSCONF)
+	@rm -f $(DESTDIR)$(AP2SYSCONF)
+	@cp $(WORKSRC)/php.ini-production $(INIDEST)
+	@perl -pi -e 's/^;extension=php_(.*).dll/;extension=$1.so/' $(INIDEST)
 	@$(MAKECOOKIE)
 
-PI_SCRIPTS  = install-extras
-PI_SCRIPTS += install-cleanup
-
 install-extras:
 	@echo "[====> Fixing Admin Scripts <====]"
-	gcp $(DOWNLOADDIR)/php.ini.CSW $(DOWNLOADDIR)/php.ini.CSW.fixed
 	perl -i -pne "s|x_PHPEXTDIR_x|_PHPEXTDIR_|" $(DOWNLOADDIR)/php.ini.CSW.fixed
-	perl -i -pne "s|_PHPINIFILE_|$(call _get_php_ini_path,$(DESTDIR))/php.ini|" `gfind $(DOWNLOADDIR) -type f -print`
-	perl -i -pne "s|_PHPLIBDIR_|$(call _get_php_ini_path,$(DESTDIR))|" `gfind $(DOWNLOADDIR) -type f -print`
-	perl -i -pne "s|_PHPBINDIR_|$(call _get_php_prefix,$(DESTDIR))/bin|" `gfind $(DOWNLOADDIR) -type f -print`
-	perl -i -pne "s|_PHPETCDIR_|$(call _get_php_prefix,$(DESTDIR))/etc|" `gfind $(DOWNLOADDIR) -type f -print`
-	perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' `gfind $(DOWNLOADDIR) -type f -print`
 	@echo "[====> Installing Extra Files <====]"
 	ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin
 	gcp $(DOWNLOADDIR)/php.ini.CSW.fixed $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW
@@ -765,11 +759,3 @@
 	gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW
 	@$(MAKECOOKIE)
 
-install-cleanup:
-	@echo "[====> Cleaning Up Extra Install Files <====]"
-	gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr
-	gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr
-	$(GARBIN)/stripbin $(DESTDIR)$(shell $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)
-	$(GARBIN)/stripbin $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/bin
-	$(MAKECOOKIE)
-


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