From 0de10bf4915ba1efe482486705adc36cfa52cfa8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 1 Sep 2010 23:15:59 +0200 Subject: ncftp: use correct way of overriding steps Signed-off-by: Thomas Petazzoni --- package/ncftp/ncftp.mk | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 757cc6e5b..f3f47805f 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -23,6 +23,8 @@ endif ifeq ($(BR2_PACKAGE_NCFTP_BATCH),y) NCFTP_TARGET_BINS+=ncftpbatch +NCFTP_INSTALL_NCFTP_BATCH = \ + ln -s /usr/bin/ncftpbatch $(TARGET_DIR)/usr/bin/ncftpspooler endif ifeq ($(BR2_PACKAGE_NCFTP_BOOKMARKS),y) @@ -30,20 +32,13 @@ NCFTP_TARGET_BINS+=ncftpbookmarks NCFTP_DEPENDENCIES:=ncurses endif -$(eval $(call AUTOTARGETS,package,ncftp)) - -$(NCFTP_TARGET_INSTALL_TARGET): - $(call MESSAGE,"Installing to target") +define NCFTP_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 $(addprefix $(NCFTP_DIR)/bin/, $(NCFTP_TARGET_BINS)) $(TARGET_DIR)/usr/bin -ifeq ($(BR2_PACKAGE_NCFTP_BATCH),y) - ln -s /usr/bin/ncftpbatch $(TARGET_DIR)/usr/bin/ncftpspooler -endif -ifeq ($(BR2_ENABLE_DEBUG),) - $(STRIPCMD) $(STRIP_STRIP_ALL) $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS)) -endif - touch $@ + $(NCFTP_INSTALL_NCFTP_BATCH) +endef -$(NCFTP_TARGET_UNINSTALL): - $(call MESSAGE,"Uninstalling") +define NCFTP_UNINSTALL_TARGET_CMDS rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS) ncftpspooler) - rm -f $(NCFTP_TARGET_INSTALL_TARGET) +endef + +$(eval $(call AUTOTARGETS,package,ncftp)) -- cgit v1.2.3