this patch fixes package/Makefile.

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

diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile
index 76e63d3..384394b 100644 (file)
--- a/package/pcmcia-cs/Makefile
+++ b/package/pcmcia-cs/Makefile
@@ -1,30 +1,33 @@
-# $Id$
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 
 include $(TOPDIR)/rules.mk
 
 include $(TOPDIR)/rules.mk

+include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=pcmcia-cs
 PKG_VERSION:=3.2.8
 PKG_RELEASE:=1
 
 
 PKG_NAME:=pcmcia-cs
 PKG_VERSION:=3.2.8
 PKG_RELEASE:=1
 

-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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5

-PKG_CAT:=zcat

 
 

-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk

 
 define Package/pcmcia-cs
 
 define Package/pcmcia-cs

-SECTION:=base
-# CATEGORY:=FIXME
-DEFAULT:=n
-TITLE:=PCMCIA/Cardbus management utilities
-DESCRIPTION:=PCMCIA/Cardbus management utilities
-URL:=http://pcmcia-cs.sourceforge.net/
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=@LINUX_2_4 @PCMCIA_SUPPORT
+  TITLE:=PCMCIA/Cardbus management utilities
+  URL:=http://pcmcia-cs.sourceforge.net/

 endef
 
 endef
 

+$(STAMP_CONFIGURED): $(LINUX_DIR)/.config
+

 define Build/Configure
        ( cd $(PKG_BUILD_DIR); \
                ./Configure \
 define Build/Configure
        ( cd $(PKG_BUILD_DIR); \
                ./Configure \


@@ -40,24 +43,26 @@ define Build/Configure
                        --nopnp \
                        --notrust \
                        --nox11 \
                        --nopnp \
                        --notrust \
                        --nox11 \

-                       --sysv --rcdir="/etc" \
+                       --rcdir="/etc" \
+                       --sysv \

        )
 endef
 
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        )
 endef
 
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)

-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(call Build/Compile/Default, \

                CFLAGS="$(TARGET_CFLAGS)" \
                CFLAGS="$(TARGET_CFLAGS)" \

-               all install
+               all install \
+       )

 endef
 
 define Package/pcmcia-cs/install
 endef
 
 define Package/pcmcia-cs/install

-       install -m0755 -d $(1)/etc
+       $(INSTALL_DIR) $(1)/etc

        $(CP) $(PKG_INSTALL_DIR)/etc/pcmcia $(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/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/

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