[PATCH] [package] pcmciautils: fix pccardctl segfault
[openwrt/svn-archive/archive.git] / utils / pcmciautils / Makefile
index ea60ce9c4d8caf619cfdb7e0975185f8d329a8fb..e54fb618f9bcc98b08c4a78582ebde76a6ab9de6 100644 (file)
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pcmciautils
 PKG_VERSION:=015
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/utils/kernel/pcmcia/
@@ -31,7 +31,7 @@ define Build/Compile
        $(call Build/Compile/Default, \
                LD="$(TARGET_CC)" UDEV=false \
                CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
-               -DPCMCIAUTILS_VERSION=$(PKG_VERSION)" \
+               -DPCMCIAUTILS_VERSION=\\\"$(PKG_VERSION)\\\"" \
                prefix=/usr all \
        )
 endef
@@ -41,6 +41,7 @@ define Package/pcmciautils/install
        $(CP) $(PKG_BUILD_DIR)/pccardctl $(1)/usr/sbin/
        $(CP) $(PKG_BUILD_DIR)/pcmcia-check-broken-cis $(1)/usr/sbin/
        $(CP) $(PKG_BUILD_DIR)/pcmcia-socket-startup $(1)/usr/sbin/
+       rm -f $(1)/usr/sbin/lspcmcia
        ln -s pccardctl $(1)/usr/sbin/lspcmcia
        $(INSTALL_DIR) $(1)/etc/pcmcia/
        $(CP) $(PKG_BUILD_DIR)/config/config.opts $(1)/etc/pcmcia/