improve dependency handling, fix some package makefile bugs

[openwrt.git] / package / pcmcia-cs / Makefile

diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile
index c89ce29..a389fd6 100644 (file)
--- a/package/pcmcia-cs/Makefile
+++ b/package/pcmcia-cs/Makefile
@@ -12,12 +12,13 @@ PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5
 PKG_CAT:=zcat
 
 PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5
 PKG_CAT:=zcat
 

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

 include $(TOPDIR)/package/rules.mk
 
 define Package/pcmcia-cs
 SECTION:=base
 include $(TOPDIR)/package/rules.mk
 
 define Package/pcmcia-cs
 SECTION:=base

-# CATEGORY:=FIXME
-DEFAULT:=n
+DEPENDS:=@PCMCIA_SUPPORT

 TITLE:=PCMCIA/Cardbus management utilities
 DESCRIPTION:=PCMCIA/Cardbus management utilities
 URL:=http://pcmcia-cs.sourceforge.net/
 TITLE:=PCMCIA/Cardbus management utilities
 DESCRIPTION:=PCMCIA/Cardbus management utilities
 URL:=http://pcmcia-cs.sourceforge.net/


@@ -42,12 +43,20 @@ define Build/Configure
        )
 endef
 
        )
 endef
 

+define Build/Compile
+       rm -rf $(PKG_INSTALL_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               all install
+endef
+

 define Package/pcmcia-cs/install
        install -m0755 -d $(1)/etc
 define Package/pcmcia-cs/install
        install -m0755 -d $(1)/etc

+       $(CP) $(PKG_INSTALL_DIR)/etc/pcmcia $(1)/etc/

        install -m0755 -d $(1)/usr/sbin
        install -m0755 -d $(1)/usr/sbin

-       install -m0644 $(PKG_INSTALL_DIR)/etc/pcmcia $(1)/etc/
-       install -m0755 $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/
-       install -m0755 $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/

 endef
 
 $(eval $(call BuildPackage,pcmcia-cs))
 endef
 
 $(eval $(call BuildPackage,pcmcia-cs))