summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanomi Manchego <danomimanchego123@gmail.com>2015-06-24 23:32:49 -0400
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-28 23:00:57 +0200
commitf6d1d1518c192b4e33b736528a68d4d1f20b10e8 (patch)
tree71f66945770591026cd69f58bc943d9675537a8c
parentb59567b38ece8de4c23fb04f55ab7c6d086b1fc5 (diff)
downloadbuildroot-f6d1d1518c192b4e33b736528a68d4d1f20b10e8.tar.gz
buildroot-f6d1d1518c192b4e33b736528a68d4d1f20b10e8.zip
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>
-rw-r--r--package/nginx/nginx.mk2
1 files changed, 1 insertions, 1 deletions
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
OpenPOWER on IntegriCloud