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

[bdwalton at users.sourceforge.net]

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

Log Message:
-----------
php5/trunk: update ini file handling to use preserveconf (still need to migrate this)

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-04-22 12:50:12 UTC (rev 14379)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-22 12:57:48 UTC (rev 14380)
@@ -59,6 +59,8 @@
 # of sqlite...
 BUILD_DEP_PKGS += CSWsqlite
 
+PRESERVECONF = $(prefix)/php5/lib/php.ini
+
 define php5_subpackage
 PACKAGES += CSWphp5-$(1)
 CATALOGNAME_CSWphp5-$(1) ?= php5_$(1)
@@ -311,7 +313,7 @@
 	@$(MAKECOOKIE)
 
 post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf
-post-install-modulated: INIDEST=$(DESTDIR)$(prefix)/php5/lib/php.ini.CSW
+post-install-modulated: INIDEST=$(DESTDIR)$(prefix)/php5/lib/php.ini
 post-install-modulated:
 	@rm -f $(DESTDIR)$(AP2SYSCONF)
 	@cp $(WORKSRC)/php.ini-production $(INIDEST)


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