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>
This commit is contained in:
Adam Duskett 2021-03-20 15:28:32 -07:00 committed by Thomas Petazzoni
parent 720deac3d9
commit e6c2e3a869

View File

@ -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