diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-02-09 23:33:30 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-02-09 23:33:30 +0800 |
| commit | c339d5217aa1966689424c911c8f455652861bf7 (patch) | |
| tree | 7b1ee77b141464a7ba0d3a17caafa95363497afd | |
| parent | f45752eb8393ebe758d8e920f7a48a2a39aa6ea5 (diff) | |
| parent | 6772fbff621e7f39cea9ad7e90ec9380abe100a6 (diff) | |
| download | php-git-c339d5217aa1966689424c911c8f455652861bf7.tar.gz | |
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
| -rw-r--r-- | Makefile.global | 2 | ||||
| -rw-r--r-- | ext/pdo/Makefile.frag | 2 | ||||
| -rw-r--r-- | sapi/fpm/Makefile.frag | 2 | ||||
| -rw-r--r-- | sapi/litespeed/Makefile.frag | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.global b/Makefile.global index bd82daf4d8..bcf01b9c42 100644 --- a/Makefile.global +++ b/Makefile.global @@ -53,7 +53,7 @@ install-headers: paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \ done; \ $(mkinstalldirs) $$paths && \ - echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \ + echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \ for i in `echo $(INSTALL_HEADERS)`; do \ if test "$(PHP_PECL_EXTENSION)"; then \ src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \ 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 \ diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag index 6ed9e4a249..d6e1a96fa6 100644 --- a/sapi/fpm/Makefile.frag +++ b/sapi/fpm/Makefile.frag @@ -18,6 +18,6 @@ install-fpm: $(SAPI_FPM_PATH) @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8 - @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/fpm/" + @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/fpm/" @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html diff --git a/sapi/litespeed/Makefile.frag b/sapi/litespeed/Makefile.frag index 767c2e5eb1..125a3b13da 100644 --- a/sapi/litespeed/Makefile.frag +++ b/sapi/litespeed/Makefile.frag @@ -4,6 +4,6 @@ $(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OB $(BUILD_LITESPEED) install-litespeed: $(SAPI_LITESPEED_PATH) - @echo "Installing PHP LiteSpeed binary: $(INSTALL_ROOT)$(bindir)/" + @echo "Installing PHP LiteSpeed binary: $(INSTALL_ROOT)$(bindir)/" @$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(INSTALL_ROOT)$(bindir)/lsphp |