usbutils: convert old-style hook to new-style hook

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 0f821281e6cc5fc66cf7e7ed392e88e821924968..508ca0d3a86a32ea51857d3afdd1d647f95d3e8a 100644 (file)
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -14,18 +14,34 @@ else
        USBUTILS_CONF_OPT = --disable-zlib
 endif
 
-$(eval $(call AUTOTARGETS,package,usbutils))
-
-$(USBUTILS_HOOK_POST_INSTALL):
+define USBUTILS_TARGET_CLEANUP
        rm -f $(TARGET_DIR)/usr/bin/usb-devices
        rm -f $(TARGET_DIR)/usr/sbin/update-usbids.sh
        rm -f $(TARGET_DIR)/usr/share/pkgconfig/usbutils.pc
-ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y)
+endef
+
+USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_TARGET_CLEANUP
+
+define USBUTILS_REMOVE_UNCOMPRESSED_IDS
        rm -f $(TARGET_DIR)/usr/share/usb.ids
-else
+endef
+
+define USBUTILS_REMOVE_COMPRESSED_IDS
        rm -f $(TARGET_DIR)/usr/share/usb.ids.gz
+endef
+
+ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y)
+USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_UNCOMPRESSED_IDS
+else
+USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_COMPRESSED_IDS
 endif
-ifneq ($(BR2_HAVE_DEVFILES),y)
+
+define USBUTILS_REMOVE_DEVFILES
        rm -f $(TARGET_DIR)/usr/bin/libusb-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_DEVFILES
 endif
-       touch $@
+
+$(eval $(call AUTOTARGETS,package,usbutils))