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 cc74db1..a389fd6 100644 (file)
--- a/package/pcmcia-cs/Makefile
+++ b/package/pcmcia-cs/Makefile
@@ -5,20 +5,26 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=pcmcia-cs
 PKG_VERSION:=3.2.8
 PKG_RELEASE:=1
-PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5
 
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,PCMCIA_UTILS,pcmcia-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/pcmcia-cs
+SECTION:=base
+DEPENDS:=@PCMCIA_SUPPORT
+TITLE:=PCMCIA/Cardbus management utilities
+DESCRIPTION:=PCMCIA/Cardbus management utilities
+URL:=http://pcmcia-cs.sourceforge.net/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
+define Build/Configure
        ( cd $(PKG_BUILD_DIR); \
                ./Configure \
                        --noprompt \
@@ -35,22 +41,22 @@ $(PKG_BUILD_DIR)/.configured:
                        --nox11 \
                        --sysv --rcdir="/etc" \
        )
-       touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built: 
+define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CFLAGS="$(TARGET_CFLAGS)" \
                all install
-       touch $@
+endef
 
-$(IPKG_PCMCIA_UTILS):
-       install -m0755 -d $(IDIR_PCMCIA_UTILS)/etc
-       cp -fpR $(PKG_INSTALL_DIR)/etc/pcmcia $(IDIR_PCMCIA_UTILS)/etc/
-       install -m0755 -d $(IDIR_PCMCIA_UTILS)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/sbin/cardctl $(IDIR_PCMCIA_UTILS)/usr/sbin/
-       cp -fpR $(PKG_INSTALL_DIR)/sbin/cardmgr $(IDIR_PCMCIA_UTILS)/usr/sbin/
-       $(RSTRIP) $(IDIR_PCMCIA_UTILS)
-       $(IPKG_BUILD) $(IDIR_PCMCIA_UTILS) $(PACKAGE_DIR)
+define Package/pcmcia-cs/install
+       install -m0755 -d $(1)/etc
+       $(CP) $(PKG_INSTALL_DIR)/etc/pcmcia $(1)/etc/
+       install -m0755 -d $(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))