From cfea3556422e92969bedbde95d32af4c3dc25c83 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Wed, 23 Oct 2013 21:05:49 -0400 Subject: [PATCH] ifplugd: ensure directories exist before installing to them Add the -D to install commands to ensure that all the necessary installation directories exist. Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard --- package/ifplugd/ifplugd.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk index ee5bd25ebe..837e0160ed 100644 --- a/package/ifplugd/ifplugd.mk +++ b/package/ifplugd/ifplugd.mk @@ -21,14 +21,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) endif define IFPLUGD_INSTALL_FIXUP - $(INSTALL) -d $(TARGET_DIR)/etc/ifplugd @if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.conf ]; then \ - $(INSTALL) $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/; \ + $(INSTALL) -D $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \ $(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \ fi - $(INSTALL) -m 0755 $(@D)/conf/ifplugd.action \ - $(TARGET_DIR)/etc/ifplugd/ - $(INSTALL) -m 0755 $(@D)/conf/ifplugd.init \ + $(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \ + $(TARGET_DIR)/etc/ifplugd/ifplugd.action + $(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.init \ $(TARGET_DIR)/etc/init.d/S45ifplugd # don't use bash for init script $(SED) 's^/bin/bash^/bin/sh^g' $(TARGET_DIR)/etc/init.d/S45ifplugd -- 2.30.2