package/mender/mender.mk: use MENDER_PKGDIR variable

Currently there is a mix of calls to package/mender and $(MENDER_PKGDIR) in the
mender.mk file. Standardize the calls to only $(MENDER_PKGDIR).

Signed-off-by: Adam Duskett <Aduskett@rivian.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index bb37f2d8ed828524c0fc743f388849df23056669..3e82f556fbc26832f31a4473c8012b6c47c7d4d7 100644 (file)
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -62,10 +62,10 @@ define MENDER_INSTALL_CONFIG_FILES
                        $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f)
        )
 
-       $(INSTALL) -D -m 0755 package/mender/artifact_info \
+       $(INSTALL) -D -m 0755 $(MENDER_PKGDIR)/artifact_info \
                        $(TARGET_DIR)/etc/mender/artifact_info
 
-       $(INSTALL) -D -m 0755 package/mender/device_type \
+       $(INSTALL) -D -m 0755 $(MENDER_PKGDIR)/device_type \
                        $(TARGET_DIR)/etc/mender/device_type
 
        mkdir -p $(TARGET_DIR)/var/lib
@@ -84,7 +84,7 @@ define MENDER_INSTALL_INIT_SYSTEMD
 endef
 
 define MENDER_INSTALL_INIT_SYSV
-       $(INSTALL) -D -m 755 package/mender/S42mender \
+       $(INSTALL) -D -m 755 $(MENDER_PKGDIR)/S42mender \
                $(TARGET_DIR)/etc/init.d/S42mender
 endef