fix install of in-tree modules ipkgs

[openwrt.git] / package / wireless-tools / Makefile

diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index f981f7b..4839563 100644 (file)
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -12,6 +12,8 @@ PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
 PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16
 PKG_CAT:=zcat
 
 PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16
 PKG_CAT:=zcat
 

+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+

 include $(TOPDIR)/package/rules.mk
 
 define Package/wireless-tools
 include $(TOPDIR)/package/rules.mk
 
 define Package/wireless-tools


@@ -36,18 +38,22 @@ define Build/Compile
 endef
 
 define Package/wireless-tools/install
 endef
 
 define Package/wireless-tools/install

-       install -d -m0755  $(IDIR_WIRELESS_TOOLS)/usr/lib
-       install -d -m0755 $(IDIR_WIRELESS_TOOLS)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/
-       install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/
+       install -d -m0755  $(1)/usr/lib
+       install -d -m0755 $(1)/usr/sbin
+       install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(1)/usr/lib/
+       install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/

 endef
 
 endef
 

-install-dev: $(PKG_BUILD_DIR)/.built
+define Build/InstallDev

        mkdir -p $(STAGING_DIR)/usr/{lib,include}
        $(CP) $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/
        ln -sf libiw.so.28 $(STAGING_DIR)/usr/lib/libiw.so
        $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/{lib,include}
        $(CP) $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/
        ln -sf libiw.so.28 $(STAGING_DIR)/usr/lib/libiw.so
        $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/

+endef

        
        

-uninstall-dev:
+define Build/UninstallDev

        rm -f $(STAGING_DIR)/usr/lib/libiw.*
        rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h
        rm -f $(STAGING_DIR)/usr/lib/libiw.*
        rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h

+endef
+
+$(eval $(call BuildPackage,wireless-tools))