From 0bc275192ec181afc6826a4347ebafdaedd02cad Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 1 Sep 2010 23:55:07 +0200 Subject: [PATCH] ntfsprogs: use correct step override method The target installation step is removed, as the default 'make install' already does the correct thing. Signed-off-by: Thomas Petazzoni --- package/ntfsprogs/ntfsprogs.mk | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/package/ntfsprogs/ntfsprogs.mk b/package/ntfsprogs/ntfsprogs.mk index 2046d29a8e..4557747ec7 100644 --- a/package/ntfsprogs/ntfsprogs.mk +++ b/package/ntfsprogs/ntfsprogs.mk @@ -16,29 +16,11 @@ ifeq ($(BR2_PACKAGE_LIBFUSE),y) NTFSPROGS_DEPENDENCIES += libfuse endif -$(eval $(call AUTOTARGETS,package,ntfsprogs)) - -$(NTFSPROGS_TARGET_INSTALL_TARGET): $(NTFSPROGS_TARGET_INSTALL_STAGING) - $(call MESSAGE,"Installing to target") - cp -dpf $(STAGING_DIR)/usr/lib/libntfs.so* $(TARGET_DIR)/usr/lib/ - $(INSTALL) -m 0755 $(addprefix $(STAGING_DIR)/usr/bin/,$(NTFSPROGS_BIN)) $(TARGET_DIR)/usr/bin - $(INSTALL) -m 0755 $(addprefix $(STAGING_DIR)/usr/sbin/,$(NTFSPROGS_SBIN)) $(TARGET_DIR)/usr/sbin - ln -s /usr/sbin/mkntfs $(TARGET_DIR)/sbin/mkfs.ntfs - touch $@ - -ifeq ($(BR2_ENABLE_DEBUG),) -$(NTFSPROGS_HOOK_POST_INSTALL): $(NTFSPROGS_TARGET_INSTALL_TARGET) - $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/lib/libntfs.so* - $(STRIPCMD) $(STRIP_STRIP_ALL) $(addprefix $(TARGET_DIR)/usr/bin/,$(NTFSPROGS_BIN)) - $(STRIPCMD) $(STRIP_STRIP_ALL) $(addprefix $(TARGET_DIR)/usr/sbin/,$(NTFSPROGS_SBIN)) - touch $@ -endif - -$(NTFSPROGS_TARGET_UNINSTALL): - $(call MESSAGE,"Uninstalling") - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(NTFSPROGS_DIR) uninstall +define NTFSPROGS_UNINSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/usr/lib/libntfs.so* rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(NTFSPROGS_BIN)) rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(NTFSPROGS_SBIN)) -unlink $(TARGET_DIR)/sbin/mkfs.ntfs - rm -f $(NTFSPROGS_TARGET_INSTALL_STAGING) $(NTFSPROGS_TARGET_INSTALL_TARGET) $(NTFSPROGS_HOOK_POST_INSTALL) +endef + +$(eval $(call AUTOTARGETS,package,ntfsprogs))