diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-07 13:14:46 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-07 13:14:46 -0700 |
| commit | ae4f8b2ab091cf96058e20ebfab387e21cd26b4c (patch) | |
| tree | 65b690d142147bdf97241acfab9e0f8263a62151 | |
| parent | c932d532c8d858bed66b5393cc8d7be21f26dd2e (diff) | |
| parent | 4ed133c4e216b62778fc9c2c53b27be5f454850f (diff) | |
| download | php-git-ae4f8b2ab091cf96058e20ebfab387e21cd26b4c.tar.gz | |
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.
| -rw-r--r-- | Makefile.global | 2 | ||||
| -rw-r--r-- | scripts/Makefile.frag | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global index 4edaca9cf6..05c5d151b7 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 00272b02b1..7cd78fabad 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) |