From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Wed, 25 Jan 2012 13:09:37 +0000 (+0000)
Subject: [packages] php5: Don't fail on non-existing file removal
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=6b500d4f4ec3d651e43d5e9515aeca04e01d410b;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] php5: Don't fail on non-existing file removal

SVN-Revision: 29907
---

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index dde151d35e..dee858bc86 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
 PKG_VERSION:=5.3.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.php.net/distributions/
@@ -479,7 +479,7 @@ endef
 
 define Build/InstallDev
 	make -C $(PKG_BUILD_DIR) install INSTALL_ROOT=$(PKG_BUILD_DIR)/staging
-	rm $(PKG_BUILD_DIR)/staging/usr/bin/php
+	rm -f $(PKG_BUILD_DIR)/staging/usr/bin/php
 	$(CP) $(PKG_BUILD_DIR)/staging/* $(STAGING_DIR_HOST)
 	sed -i -e "s#prefix='/usr'#prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize
 	sed -i -e "s#exec_prefix=\"\`eval echo /usr\`\"#exec_prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize