revert gcc to 4.1.1 for x86 to fix uclibc++ build (closes: #1056, #1202)

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

diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile
index fcdf71c..1b096fc 100644 (file)
--- a/package/pcmcia-cs/Makefile
+++ b/package/pcmcia-cs/Makefile
@@ -12,22 +12,22 @@ PKG_NAME:=pcmcia-cs
 PKG_VERSION:=3.2.8
 PKG_RELEASE:=1
 
 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_CAT:=zcat
 
 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 $(INCLUDE_DIR)/package.mk
 
 define Package/pcmcia-cs
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
 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/
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=@PCMCIA_SUPPORT
+  TITLE:=PCMCIA/Cardbus management utilities
+  URL:=http://pcmcia-cs.sourceforge.net/

 endef
 
 define Build/Configure
 endef
 
 define Build/Configure


@@ -45,18 +45,24 @@ define Build/Configure
                        --nopnp \
                        --notrust \
                        --nox11 \
                        --nopnp \
                        --notrust \
                        --nox11 \

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

        )
 endef
 
 define Build/Compile
        )
 endef
 
 define Build/Compile

-  $(call Build/Compile/Default,CFLAGS="$(TARGET_CFLAGS)" all install)
+       rm -rf $(PKG_INSTALL_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)
+       $(call Build/Compile/Default, \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               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
+       $(INSTALL_DIR) $(1)/usr/sbin

        $(CP) $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/
        $(CP) $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/
 endef
        $(CP) $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/
        $(CP) $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/
 endef