diff options
| author | Anatol Belski <ab@php.net> | 2018-05-21 12:19:45 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-05-21 12:19:45 +0200 |
| commit | 1c8c06a403c0216cdbcf6a90b5ae8ba87639ff6c (patch) | |
| tree | 1a4a077d7d87bb83570fade42f2c61c38c8d1efc | |
| parent | 364fad275e009f455d8d410ccdea06efd2ec17fc (diff) | |
| parent | bc6ddb7f458d0933ee318e732acca464cd924713 (diff) | |
| download | php-git-1c8c06a403c0216cdbcf6a90b5ae8ba87639ff6c.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Allow pecl like usage in ext/pdo, refs #2955
| -rw-r--r-- | ext/pdo/Makefile.frag | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag index 58125ed872..d2b59744ef 100644 --- a/ext/pdo/Makefile.frag +++ b/ext/pdo/Makefile.frag @@ -7,7 +7,12 @@ PDO_HEADER_FILES= \ $(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) + @(cd $(top_srcdir); \ + if test -f ./pdo_sql_parser.re; then \ + $(RE2C) --no-generation-date -o pdo_sql_parser.c pdo_sql_parser.re; \ + else \ + $(RE2C) --no-generation-date -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re; \ + fi) install-pdo-headers: @echo "Installing PDO headers: $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/" |