From 01659b8b7c3305c9975e117adc7ba4674a3fcfc8 Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Thu, 23 Jul 2009 15:48:04 +0000
Subject: [PATCH] fix php bug #48783: make install will fail saying phar file
 exists

---
 NEWS                   | 1 +
 ext/phar/Makefile.frag | 1 +
 2 files changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index 8e5c212692..c1ea6fd4e5 100644
--- 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 b115e9757c..076ce8a93c 100755
--- 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
-- 
2.40.0