X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Fpcmcia-cs%2FMakefile;h=0f1a7f7876dccf47113227453579eae9e3931c1b;hb=dbd58c1d4d109832d89e168fc50f30235fd88dd9;hp=fcdf71cd76ac29fe9cf0dac87a5b1813a1447488;hpb=ae98e0cfbcade9b099afc6f7bcbbaa1ed9d5448c;p=openwrt.git

diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile
index fcdf71cd76..0f1a7f7876 100644
--- a/package/pcmcia-cs/Makefile
+++ b/package/pcmcia-cs/Makefile
@@ -12,24 +12,22 @@ 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_CAT:=zcat
-
-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
 
+$(PKG_BUILD_DIR)/.configured: $(LINUX_DIR)/.config
+
 define Build/Configure
 	( cd $(PKG_BUILD_DIR); \
 		./Configure \
@@ -45,18 +43,24 @@ define Build/Configure
 			--nopnp \
 			--notrust \
 			--nox11 \
-			--sysv --rcdir="/etc" \
+			--rcdir="/etc" \
+			--sysv \
 	)
 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
-	install -m0755 -d $(1)/etc
+	$(INSTALL_DIR) $(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