[packages] Updated email address in packages I maintain

[openwrt/svn-archive/archive.git] / net / usbip / Makefile

diff --git a/net/usbip/Makefile b/net/usbip/Makefile
index ce88bd97a4a32df0923a8f5ed7a62a834659b013..1af6e7ed83a75d03418bcbe2358075e44ccaef8e 100644 (file)
--- a/net/usbip/Makefile
+++ b/net/usbip/Makefile
@@ -24,7 +24,8 @@ include $(INCLUDE_DIR)/package.mk
 define Package/usbip/Common
   TITLE:=USB-over-IP
   URL:=http://usbip.sourceforge.net/
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT
+  DEPENDS:=@!LINUX_2_4 @USB_SUPPORT +glib2 +sysfsutils
+  MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
 endef
 
 define Package/usbip/Default
@@ -36,19 +37,19 @@ endef
 define Package/usbip
 $(call Package/usbip/Default)
   TITLE+= (common)
-  DEPENDS+= +glib2 +libsysfs +libwrap
+  DEPENDS+= +glib2 +sysfsutils +libwrap +kmod-usbip
 endef
 
 define Package/usbip-client
 $(call Package/usbip/Default)
   TITLE+= (client)
-  DEPENDS+= +usbip +kmod-usbip-client
+  DEPENDS+= usbip +kmod-usbip-client
 endef
 
 define Package/usbip-server
 $(call Package/usbip/Default)
   TITLE+= (server)
-  DEPENDS+= +usbip +kmod-usbip-server
+  DEPENDS+= usbip +kmod-usbip-server
 endef
 
 define KernelPackage/usbip/Default
@@ -68,7 +69,7 @@ define KernelPackage/usbip-client
 $(call KernelPackage/usbip/Default)
   SUBMENU:=USB Support
   TITLE+= (kernel client driver)
-  DEPENDS+= +kmod-usbip
+  DEPENDS+= kmod-usbip
   KCONFIG:= USB_IP_VHCI_HCD=m
   FILES:=$(LINUX_DIR)/drivers/staging/usbip/vhci-hcd.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,99,vhci-hcd)
@@ -78,7 +79,7 @@ define KernelPackage/usbip-server
 $(call KernelPackage/usbip/Default)
   SUBMENU:=USB Support
   TITLE+= (kernel host driver)
-  DEPENDS+= +kmod-usbip
+  DEPENDS+= kmod-usbip
   KCONFIG:= USB_IP_HOST=m
   FILES:=$(LINUX_DIR)/drivers/staging/usbip/usbip.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,99,usbip)
@@ -90,9 +91,11 @@ CONFIGURE_PATH:=./src
 MAKE_PATH:=./src
 LIBTOOL_PATHS:=./src
 
+CFLAGS+="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include"
+
 define Build/Prepare
 $(call Build/Prepare/Default)
-       (cd $(PKG_BUILD_DIR)/src; [ -x ./configure ] || ./autogen.sh )
+       (cd $(PKG_BUILD_DIR)/src; ./autogen.sh )
 endef
 
 define Build/Compile/kmod
@@ -114,10 +117,10 @@ define Package/usbip/install
        $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/libusbip.so.* \
                $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/share/usbip
+       $(INSTALL_DIR) $(1)/usr/share/hwdata
        $(CP) \
                $(PKG_INSTALL_DIR)/usr/share/usbip/usb.ids \
-               $(1)/usr/share/usbip/
+               $(1)/usr/share/hwdata/
 endef
 
 define Package/usbip-client/install
@@ -130,9 +133,11 @@ endef
 define Package/usbip-server/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(CP) \
-               $(PKG_INSTALL_DIR)/usr/bin/bind_driver \
                $(PKG_INSTALL_DIR)/usr/bin/usbipd \
                $(1)/usr/bin/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/bin/bind_driver \
+               $(1)/usr/bin/usbip_bind_driver
 endef
 
 $(eval $(call BuildPackage,usbip))