diff options
| author | Anatol Belski <ab@php.net> | 2018-01-15 14:25:45 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-01-15 14:25:45 +0100 |
| commit | c5768a7e2441204bce30d24d867bd2b3e8618213 (patch) | |
| tree | b5100eb24c7901218f070f71a96a71f808c13db5 | |
| parent | f3c1726d25334c85d00e873648d82baee8fbd2a0 (diff) | |
| parent | 2d4fb56c1d333069fa847d6e7c1f415fa41f631e (diff) | |
| download | php-git-c5768a7e2441204bce30d24d867bd2b3e8618213.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Allow pecl like usage in ext/phar, closes #2955
| -rw-r--r-- | ext/phar/Makefile.frag | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index e58795deea..0e3713fc63 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -1,5 +1,10 @@ $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re - @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re) + @(cd $(top_srcdir); \ + if test -f ./php_phar.h; then \ + $(RE2C) --no-generation-date -b -o phar_path_check.c phar_path_check.re; \ + else \ + $(RE2C) --no-generation-date -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re; \ + fi) pharcmd: $(builddir)/phar.php $(builddir)/phar.phar |