diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2016-02-08 20:29:24 +0200 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2016-02-08 20:29:24 +0200 |
| commit | fb7d673ef2142f3d11a190b2ce64133728a950af (patch) | |
| tree | 94003292402371f6e8bd015825930227f138901b /ext | |
| parent | 3ef57f8d5d1ca853aebbc873b6bf18dbdcc197da (diff) | |
| parent | 6772fbff621e7f39cea9ad7e90ec9380abe100a6 (diff) | |
| download | php-git-fb7d673ef2142f3d11a190b2ce64133728a950af.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Align spacing in make install messages
Add entry for re-fix of #70976 in commit 14e4d393
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pdo/Makefile.frag | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag index dc25c9f70b..58125ed872 100644 --- a/ext/pdo/Makefile.frag +++ b/ext/pdo/Makefile.frag @@ -10,7 +10,7 @@ $(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re (cd $(top_srcdir); $(RE2C) --no-generation-date -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re) install-pdo-headers: - @echo "Installing PDO headers: $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/" + @echo "Installing PDO headers: $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/" @$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/pdo @for f in $(PDO_HEADER_FILES); do \ if test -f "$(top_srcdir)/$$f"; then \ |