Revision: 4893
          http://gar.svn.sourceforge.net/gar/?rev=4893&view=rev
Author:   valholla
Date:     2009-05-16 11:25:46 +0000 (Sat, 16 May 2009)

Log Message:
-----------
split up Makefile for easier Reading

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile
    csw/mgar/pkg/php5/trunk/Makefile.Orig
    csw/mgar/pkg/php5/trunk/Makefile.default-dirs

Added Paths:
-----------
    csw/mgar/pkg/php5/trunk/files/scripts.mk

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile    2009-05-16 11:07:16 UTC (rev 4892)
+++ csw/mgar/pkg/php5/trunk/Makefile    2009-05-16 11:25:46 UTC (rev 4893)
@@ -85,70 +85,5 @@
 SKIPTEST = 1
 ENABLE_CHECK = 0
 
-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
-
-PI_SCRIPTS  = install-extras
-PI_SCRIPTS += install-ap2modphp5
-PI_SCRIPTS += install-modphp5
-PI_SCRIPTS += install-cleanup
-
-post-install-modulated: $(PI_SCRIPTS)
-       @$(MAKECOOKIE)
-
-install-extras:
-       @echo "[====> Fixing Admin Scripts <====]"
-       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`
-       @echo "[====> Installing Extra Files <====]"
-       ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin
-       perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' 
$(DOWNLOADDIR)/php.ini.CSW
-       ginstall -m 0644 $(DOWNLOADDIR)/php.ini.CSW $(DESTDIR)$(call 
_get_php_ini_path,$(DESTDIR))
-       ginstall -m 0644 $(DOWNLOADDIR)/pear.conf.CSW $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/etc
-       @$(MAKECOOKIE)
-
-install-ap2modphp5:
-       @echo "[====> Now Building ap2_modphp5 <====]"
-       if [ -f $(WORKSRC)/Makefile ]; then \
-               $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi
-       cd $(WORKSRC) && $(BUILD_ENV) \
-               ./configure $(CONFIGURE_ARGS) 
--with-apxs2=$(prefix)/apache2/sbin/apxs
-       $(GARBIN)/fixlibtool $(WORKSRC)
-       $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
-       strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so
-       ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
-       ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW 
$(DESTDIR)$(prefix)/apache2/etc/extra
-       @$(MAKECOOKIE)
-
-install-modphp5:
-       @echo "[====> Now Building mod_php5 <====]"
-       if [ -f $(WORKSRC)/Makefile ]; then $(BUILD_ENV) gmake -C $(WORKSRC) 
distclean; fi
-       cd $(WORKSRC) && $(BUILD_ENV) ./configure $(CONFIGURE_ARGS) 
--with-apxs=$(prefix)/apache/bin/apxs
-       $(GARBIN)/fixlibtool $(WORKSRC)
-       $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
-       strip $(DESTDIR)$(prefix)/apache/libexec/libphp5.so
-       @$(MAKECOOKIE)
-
-install-cleanup:
-       @echo "[====> Cleaning Up Extra Install Files <====]"
-       gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr
-       grm -f $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf
-       gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v 
"etc|libexec" | xargs grm -fr
-       $(MAKECOOKIE)
-
-EXTFILES = $(shell find extensions/*/files/* -prune -type f)
-pre-fetch:
-       $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR)))
-
-# System Rules/Configuration
+include files/scripts.mk
 include gar/category.mk

Modified: csw/mgar/pkg/php5/trunk/Makefile.Orig
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile.Orig       2009-05-16 11:07:16 UTC (rev 
4892)
+++ csw/mgar/pkg/php5/trunk/Makefile.Orig       2009-05-16 11:25:46 UTC (rev 
4893)
@@ -85,70 +85,5 @@
 SKIPTEST = 1
 ENABLE_CHECK = 0
 
-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
-
-PI_SCRIPTS  = install-extras
-PI_SCRIPTS += install-ap2modphp5
-PI_SCRIPTS += install-modphp5
-PI_SCRIPTS += install-cleanup
-
-post-install-modulated: $(PI_SCRIPTS)
-       @$(MAKECOOKIE)
-
-install-extras:
-       @echo "[====> Fixing Admin Scripts <====]"
-       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`
-       @echo "[====> Installing Extra Files <====]"
-       ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin
-       perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' 
$(DOWNLOADDIR)/php.ini.CSW
-       ginstall -m 0644 $(DOWNLOADDIR)/php.ini.CSW $(DESTDIR)$(call 
_get_php_ini_path,$(DESTDIR))
-       ginstall -m 0644 $(DOWNLOADDIR)/pear.conf.CSW $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/etc
-       @$(MAKECOOKIE)
-
-install-ap2modphp5:
-       @echo "[====> Now Building ap2_modphp5 <====]"
-       if [ -f $(WORKSRC)/Makefile ]; then \
-               $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi
-       cd $(WORKSRC) && $(BUILD_ENV) \
-               ./configure $(CONFIGURE_ARGS) 
--with-apxs2=$(prefix)/apache2/sbin/apxs
-       $(GARBIN)/fixlibtool $(WORKSRC)
-       $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
-       strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so
-       ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
-       ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW 
$(DESTDIR)$(prefix)/apache2/etc/extra
-       @$(MAKECOOKIE)
-
-install-modphp5:
-       @echo "[====> Now Building mod_php5 <====]"
-       if [ -f $(WORKSRC)/Makefile ]; then $(BUILD_ENV) gmake -C $(WORKSRC) 
distclean; fi
-       cd $(WORKSRC) && $(BUILD_ENV) ./configure $(CONFIGURE_ARGS) 
--with-apxs=$(prefix)/apache/bin/apxs
-       $(GARBIN)/fixlibtool $(WORKSRC)
-       $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
-       strip $(DESTDIR)$(prefix)/apache/libexec/libphp5.so
-       @$(MAKECOOKIE)
-
-install-cleanup:
-       @echo "[====> Cleaning Up Extra Install Files <====]"
-       gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr
-       grm -f $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf
-       gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v 
"etc|libexec" | xargs grm -fr
-       $(MAKECOOKIE)
-
-EXTFILES = $(shell find extensions/*/files/* -prune -type f)
-pre-fetch:
-       $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR)))
-
-# System Rules/Configuration
+include files/scripts.mk
 include gar/category.mk

Modified: csw/mgar/pkg/php5/trunk/Makefile.default-dirs
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile.default-dirs       2009-05-16 11:07:16 UTC 
(rev 4892)
+++ csw/mgar/pkg/php5/trunk/Makefile.default-dirs       2009-05-16 11:25:46 UTC 
(rev 4893)
@@ -85,71 +85,5 @@
 SKIPTEST = 1
 ENABLE_CHECK = 0
 
-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
-
-PI_SCRIPTS  = install-extras
-PI_SCRIPTS += install-ap2modphp5
-PI_SCRIPTS += install-modphp5
-PI_SCRIPTS += install-cleanup
-
-post-install-modulated: $(PI_SCRIPTS)
-       @$(MAKECOOKIE)
-
-
-install-extras:
-       @echo "[====> Fixing Admin Scripts <====]"
-       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`
-       @echo "[====> Installing Extra Files <====]"
-       ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin
-       perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' 
$(DOWNLOADDIR)/php.ini.CSW
-       ginstall -m 0644 $(DOWNLOADDIR)/php.ini.CSW $(DESTDIR)$(call 
_get_php_ini_path,$(DESTDIR))
-       ginstall -m 0644 $(DOWNLOADDIR)/pear.conf.CSW $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/etc
-       @$(MAKECOOKIE)
-
-install-ap2modphp5:
-       @echo "[====> Now Building ap2_modphp5 <====]"
-       if [ -f $(WORKSRC)/Makefile ]; then \
-               $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi
-       cd $(WORKSRC) && $(BUILD_ENV) \
-               ./configure $(CONFIGURE_ARGS) 
--with-apxs2=$(prefix)/apache2/sbin/apxs
-       $(GARBIN)/fixlibtool $(WORKSRC)
-       $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
-       strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so
-       ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
-       ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW 
$(DESTDIR)$(prefix)/apache2/etc/extra
-       @$(MAKECOOKIE)
-
-install-modphp5:
-       @echo "[====> Now Building mod_php5 <====]"
-       if [ -f $(WORKSRC)/Makefile ]; then $(BUILD_ENV) gmake -C $(WORKSRC) 
distclean; fi
-       cd $(WORKSRC) && $(BUILD_ENV) ./configure $(CONFIGURE_ARGS) 
--with-apxs=$(prefix)/apache/bin/apxs
-       $(GARBIN)/fixlibtool $(WORKSRC)
-       $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
-       strip $(DESTDIR)$(prefix)/apache/libexec/libphp5.so
-       @$(MAKECOOKIE)
-
-install-cleanup:
-       @echo "[====> Cleaning Up Extra Install Files <====]"
-       gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr
-       grm -f $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf
-       gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v 
"etc|libexec" | xargs grm -fr
-       $(MAKECOOKIE)
-
-EXTFILES = $(shell find extensions/*/files/* -prune -type f)
-pre-fetch:
-       $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR)))
-
-# System Rules/Configuration
+include files/scripts.mk
 include gar/category.mk

Added: csw/mgar/pkg/php5/trunk/files/scripts.mk
===================================================================
--- csw/mgar/pkg/php5/trunk/files/scripts.mk                            (rev 0)
+++ csw/mgar/pkg/php5/trunk/files/scripts.mk    2009-05-16 11:25:46 UTC (rev 
4893)
@@ -0,0 +1,69 @@
+#
+# 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
+
+PI_SCRIPTS  = install-extras
+PI_SCRIPTS += install-ap2modphp5
+PI_SCRIPTS += install-modphp5
+PI_SCRIPTS += install-cleanup
+
+post-install-modulated: $(PI_SCRIPTS)
+       @$(MAKECOOKIE)
+
+install-extras:
+       @echo "[====> Fixing Admin Scripts <====]"
+       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`
+       @echo "[====> Installing Extra Files <====]"
+       ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin
+       perl -i -pne 's|_PHPEXTDIR_|$(shell $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/bin/php-config --extension-dir)|' 
$(DOWNLOADDIR)/php.ini.CSW
+       ginstall -m 0644 $(DOWNLOADDIR)/php.ini.CSW $(DESTDIR)$(call 
_get_php_ini_path,$(DESTDIR))
+       ginstall -m 0644 $(DOWNLOADDIR)/pear.conf.CSW $(DESTDIR)$(call 
_get_php_prefix,$(DESTDIR))/etc
+       @$(MAKECOOKIE)
+
+install-ap2modphp5:
+       @echo "[====> Now Building ap2_modphp5 <====]"
+       if [ -f $(WORKSRC)/Makefile ]; then \
+               $(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi
+       cd $(WORKSRC) && $(BUILD_ENV) \
+               ./configure $(CONFIGURE_ARGS) 
--with-apxs2=$(prefix)/apache2/sbin/apxs
+       $(GARBIN)/fixlibtool $(WORKSRC)
+       $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
+       strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so
+       ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
+       ginstall -m 0644 $(DOWNLOADDIR)/httpd-php5.conf.CSW 
$(DESTDIR)$(prefix)/apache2/etc/extra
+       @$(MAKECOOKIE)
+
+install-modphp5:
+       @echo "[====> Now Building mod_php5 <====]"
+       if [ -f $(WORKSRC)/Makefile ]; then $(BUILD_ENV) gmake -C $(WORKSRC) 
distclean; fi
+       cd $(WORKSRC) && $(BUILD_ENV) ./configure $(CONFIGURE_ARGS) 
--with-apxs=$(prefix)/apache/bin/apxs
+       $(GARBIN)/fixlibtool $(WORKSRC)
+       $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
+       strip $(DESTDIR)$(prefix)/apache/libexec/libphp5.so
+       @$(MAKECOOKIE)
+
+install-cleanup:
+       @echo "[====> Cleaning Up Extra Install Files <====]"
+       gfind $(DESTDIR) -name \.[a-z]\* -print |xargs grm -fr
+       grm -f $(DESTDIR)$(call _get_php_prefix,$(DESTDIR))/etc/pear.conf
+       gfind $(DESTDIR)$(prefix)/apache* -mindepth 1 -type d | egrep -v 
"etc|libexec" | xargs grm -fr
+       $(MAKECOOKIE)
+
+EXTFILES = $(shell find extensions/*/files/* -prune -type f)
+pre-fetch:
+       $(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR)))
+


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

Reply via email to