package/swupdate: use package make install for target install
authorJames Hilliard <james.hilliard1@gmail.com>
Sun, 29 Aug 2021 02:46:27 +0000 (20:46 -0600)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Sat, 11 Sep 2021 14:11:46 +0000 (16:11 +0200)
This ensures all tools/libraries will be properly installed.

Update SWUPDATE_BUILD_CMDS param ordering for consistency.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
package/swupdate/swupdate.mk

index f4a398ac8e0a8b04a8ad011ff63a11592e667898..fd0fb763c9493a6604f8f76047149e986a80a572 100644 (file)
@@ -195,11 +195,12 @@ define SWUPDATE_KCONFIG_FIXUP_CMDS
 endef
 
 define SWUPDATE_BUILD_CMDS
-       $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) $(SWUPDATE_MAKE_OPTS) -C $(@D)
+       $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) $(SWUPDATE_MAKE_OPTS)
 endef
 
 define SWUPDATE_INSTALL_TARGET_CMDS
-       $(INSTALL) -D -m 0755 $(@D)/swupdate $(TARGET_DIR)/usr/bin/swupdate
+       $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \
+               $(SWUPDATE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
        $(if $(BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE), \
                mkdir -p $(TARGET_DIR)/var/www/swupdate; \
                cp -dpfr $(@D)/examples/www/v2/* $(TARGET_DIR)/var/www/swupdate)