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

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Sat Apr 16 17:37:18 CEST 2011


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

Log Message:
-----------
php5/trunk: drop more legacy cruft

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-04-16 15:33:17 UTC (rev 14232)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-16 15:37:17 UTC (rev 14233)
@@ -716,22 +716,6 @@
 
 include gar/category.mk
 
-# funcion Definitions and mGar Extra Scripts
-#
-
-define _get_php_config
-$(abspath $(shell gfind $(1) -name php-config -print))
-endef
-
-define _get_php_prefix
-$(shell $(call _get_php_config,$(1)) --prefix)
-endef
-
-define _get_php_ini_path
-$(shell $(call _get_php_prefix,$(1))/bin/php -i | grep "Configuration File .* Path" | gawk '{print $$NF}')
-endef
-
-
 # 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...
@@ -751,12 +735,6 @@
 	@$(MAKECOOKIE)
 
 install-extras:
-	@echo "[====> Fixing Admin Scripts <====]"
-	perl -i -pne "s|x_PHPEXTDIR_x|_PHPEXTDIR_|" $(DOWNLOADDIR)/php.ini.CSW.fixed
-	@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
 	gmv $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf.CSW
-	gchmod 0644 $(DESTDIR)$(call _get_php_ini_path,$(DESTDIR))/php.ini.CSW
 	@$(MAKECOOKIE)
 


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


More information about the devel mailing list