diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-08 11:37:12 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-08 11:37:12 +0200 |
commit | e8e868c14bc5ab6cf6a9e2507823e435520efe2a (patch) | |
tree | d77981838c034d8819e745d2e1782128ee0bf2d6 /package/usb_modeswitch/usb_modeswitch.mk | |
parent | 6620ca7dfe3d3340eee4ea662d97ee611d84814f (diff) | |
parent | 6caec6f3b3aecf41c3a051ffa4b5d9a2e41775ca (diff) | |
download | buildroot-novena-e8e868c14bc5ab6cf6a9e2507823e435520efe2a.tar.gz buildroot-novena-e8e868c14bc5ab6cf6a9e2507823e435520efe2a.zip |
Merge branch 'libusb-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot
Fix merge conflicts in CHANGES
Diffstat (limited to 'package/usb_modeswitch/usb_modeswitch.mk')
-rw-r--r-- | package/usb_modeswitch/usb_modeswitch.mk | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index 306d80315..d84ccc2bf 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -7,22 +7,20 @@ USB_MODESWITCH_VERSION = 1.0.7 USB_MODESWITCH_SOURCE = usb_modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch -USB_MODESWITCH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -USB_MODESWITCH_DEPENDENCIES = libusb -USB_MODESWITCH_MAKE_OPT = CC="$(TARGET_CC)" OPTS="$(TARGET_CFLAGS)" +USB_MODESWITCH_DEPENDENCIES = libusb-compat -$(eval $(call AUTOTARGETS,package,usb_modeswitch)) +define USB_MODESWITCH_BUILD_CMDS + rm $(@D)/usb_modeswitch + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef -$(USB_MODESWITCH_TARGET_CONFIGURE): - rm -f $(USB_MODESWITCH_DIR)/usb_modeswitch - touch $@ +define USB_MODESWITCH_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef -$(USB_MODESWITCH_HOOK_POST_INSTALL): - chmod a-x $(TARGET_DIR)/etc/usb_modeswitch.conf - touch $@ +define USB_MODESWITCH_CLEAN_CMDS + rm -f $(TARGET_DIR)/usr/sbin/usb_modeswitch + rm -f $(TARGET_DIR)/etc/usb_modeswitch.conf +endef -$(USB_MODESWITCH_TARGET_UNINSTALL): - $(call MESSAGE,"Uninstalling") - rm -f $(TARGET_DIR)/usr/sbin/usb_modeswitch - rm -f $(TARGET_DIR)/etc/usb_modeswitch.conf - rm -f $(USB_MODESWITCH_TARGET_INSTALL_TARGET) $(USB_MODESWITCH_HOOK_POST_INSTALL) +$(eval $(call GENTARGETS,package,usb_modeswitch)) |