SF.net SVN: gar:[25409] csw/mgar/pkg/php5/branches/php-5.6.x/files

[cgrzemba at users.sourceforge.net]

Revision: 25409
          http://sourceforge.net/p/gar/code/25409
Author:   cgrzemba
Date:     2015-11-25 13:03:46 +0000 (Wed, 25 Nov 2015)
Log Message:
-----------
php5/branches/php-5.6.x: make postinstall more tough 2nd

Modified Paths:
--------------
    csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall
    csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove

Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall	2015-11-24 22:21:54 UTC (rev 25408)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall	2015-11-25 13:03:46 UTC (rev 25409)
@@ -12,7 +12,7 @@
      echo "Adding Include for extra/http-php5.conf to httpd.conf"
      cat << END >> $AP2_CONFIG
  
-Include extra/httpd-php5.conf
+Include $CSW_PREFIX/apache2/extra/httpd-php5.conf
 END
 fi
 

Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove	2015-11-24 22:21:54 UTC (rev 25408)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove	2015-11-25 13:03:46 UTC (rev 25409)
@@ -5,7 +5,7 @@
 AP2_MODULE=$CSW_PREFIX/apache2/extra/modules.load
 
 echo "Disabling httpd-php5.conf in httpd.conf"
-perl -i -plne 's,(?<!#)(Include extra/httpd-php5.conf),#$1,' $AP2_CONFIG
+perl -i -plne 's,(?<!#)(Include $CSW_PREFIX/apache2/extra/httpd-php5.conf),#$1,' $AP2_CONFIG
 perl -i -plne 's,(?<!#)(LoadModule php5_module .*),#$1,' $AP2_MODULE
 
 cat <<END

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