[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Makefile.global

2013-08-07 Thread Christopher Jones 
Commit:ae4f8b2ab091cf96058e20ebfab387e21cd26b4c
Author:Christopher Jones s...@php.net Wed, 7 Aug 2013 13:14:46 
-0700
Parents:   c932d532c8d858bed66b5393cc8d7be21f26dd2e 
4ed133c4e216b62778fc9c2c53b27be5f454850f
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ae4f8b2ab091cf96058e20ebfab387e21cd26b4c

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious 
line' warning when editing  saving Makefile using Emacs.

Changed paths:
  MM  Makefile.global


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing saving Makefile using Emacs.: Makefile.global scripts/Makefile.frag

2013-08-07 Thread Christopher Jones 
Commit:4ed133c4e216b62778fc9c2c53b27be5f454850f
Author:Christopher Jones s...@php.net Tue, 30 Jul 2013 13:36:10 
-0700
Parents:   2743c3aac81ac8095962f87442b0a2b59cc54445
Branches:  PHP-5.4 PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4ed133c4e216b62778fc9c2c53b27be5f454850f

Log:
Remove tabs on blanklines in Makefile sources. This prevents a
'suspicious line' warning when editing  saving Makefile using Emacs.

Changed paths:
  M  Makefile.global
  M  scripts/Makefile.frag


Diff:
diff --git a/Makefile.global b/Makefile.global
index fe31eed..6b79ad7 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -10,7 +10,7 @@ all: $(all_targets)
@echo Build complete.
@echo Don't forget to run 'make test'.
@echo
-   
+
 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
 
 build-binaries: $(PHP_BINARIES)
diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index 00272b0..7cd78fa 100644
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -44,7 +44,7 @@ install-programs: $(builddir)/phpize $(builddir)/php-config
echo   page: $(program_prefix)$${page}$(program_suffix).1; \
$(INSTALL_DATA) $(builddir)/man1/$${page}.1 
$(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \
done
-   
+
 $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status
(CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php