fix php bug #48783: make install will fail saying phar file exists

diff --git a/NEWS b/NEWS
index 8e5c212692fd9cd133a73217568f9d29fa9b6ccf..c1ea6fd4e596bad52eb13a281f66235ceacf520c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ PHP                                                                        NEWS
 - Fixed bug #48802 (printf() returns incorrect outputted length). (Jani)
 - Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked
   directories). (Ilia)
+- Fixed bug #48783 (make install will fail saying phar file exists). (Greg)
 - Fixed bug #48771 (rename() between volumes fails and reports no error on 
   Windows). (Pierre)
 - Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at 

diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index b115e9757c6da51c1f9f7f68765834086b654d07..076ce8a93c65d6d06271e5d308c67a5650eb6012 100755 (executable)
--- a/ext/phar/Makefile.frag
+++ b/ext/phar/Makefile.frag
@@ -43,4 +43,5 @@ $(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc $(srcdir)/
 install-pharcmd: pharcmd
        -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
        $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
+       -@rm -f $(INSTALL_ROOT)$(bindir)/phar
        $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar