Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Allow pecl like usage in ext/phar, closes #2955

Author: laruence

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