From: Danomi Manchego <danomimanchego123@gmail.com>
Date: Thu, 25 Jun 2015 03:32:49 +0000 (-0400)
Subject: nginx: fix nginx.old clean-up
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f6d1d1518c192b4e33b736528a68d4d1f20b10e8;p=buildroot.git

nginx: fix nginx.old clean-up

The bin path for nginx is configured for /usr/sbin, so deleting
the nginx.old back-up from /usr/bin never works.  Fix path, and
also use "$(RM)" instead of "-$(RM)", as "rm -f" never fails.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Tested-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 90ebbcc989..502bc44fe3 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -222,7 +222,7 @@ endef
 
 define NGINX_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
-	-$(RM) $(TARGET_DIR)/usr/bin/nginx.old
+	$(RM) $(TARGET_DIR)/usr/sbin/nginx.old
 	$(INSTALL) -D -m 0664 package/nginx/nginx.logrotate \
 		$(TARGET_DIR)/etc/logrotate.d/nginx
 endef