From d6febe48c82d0a65e17aab1eadfb70921e40c354 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 22 Dec 2019 21:15:33 +0100 Subject: [PATCH] package/ebtables: drop useless EBTABLES_SUBDIR variable This variable is never defined, so it is empty. Using it makes the code needlessly more complicated than it needs to be, so let's drop it. Signed-off-by: Thomas Petazzoni --- package/ebtables/ebtables.mk | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk index aae0c91a10..7b2264703c 100644 --- a/package/ebtables/ebtables.mk +++ b/package/ebtables/ebtables.mk @@ -19,19 +19,15 @@ endef ifeq ($(BR2_STATIC_LIBS),y) define EBTABLES_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/static \ - $(TARGET_DIR)/sbin/ebtables + $(INSTALL) -m 0755 -D $(@D)/static $(TARGET_DIR)/sbin/ebtables endef else define EBTABLES_INSTALL_TARGET_CMDS - for so in $(@D)/$(EBTABLES_SUBDIR)/*.so \ - $(@D)/$(EBTABLES_SUBDIR)/extensions/*.so; \ - do \ + for so in $(@D)/*.so $(@D)/extensions/*.so; do \ $(INSTALL) -m 0755 -D $${so} \ $(TARGET_DIR)/lib/ebtables/`basename $${so}` || exit 1; \ done - $(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/ebtables \ - $(TARGET_DIR)/sbin/ebtables + $(INSTALL) -m 0755 -D $(@D)/ebtables $(TARGET_DIR)/sbin/ebtables $(INSTALL) -m 0644 -D $(@D)/ethertypes $(TARGET_DIR)/etc/ethertypes endef endif -- 2.30.2