X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Flibcli%2FMakefile;h=285e7520c9d1b5d17529bc0fff5834826da07871;hp=1f2c69ccf627d2f40f5ea2687a4d22f35717b2ff;hb=16e083cd9a6acea80bbc9e01d56654fec7d8de9f;hpb=ca1a642b652f2b066044e440a9166cb9dcdf66a5

diff --git a/libs/libcli/Makefile b/libs/libcli/Makefile
index 1f2c69ccf6..285e7520c9 100644
--- a/libs/libcli/Makefile
+++ b/libs/libcli/Makefile
@@ -12,12 +12,11 @@ PKG_NAME:=libcli
 PKG_VERSION:=1.8.5
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libcli
 PKG_MD5SUM:=0fdd30df5a8c1388a4549751ba61247a
-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
@@ -26,34 +25,32 @@ define Package/libcli
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A Cisco-like CLI library
-  DESCRIPTION:=A Cisco-like Command Line Interface (CLI) library.\\\
-    Provides a shared library for including a Cisco-like \\\
-    command-line interface into other software. It's a telnet \\\
-    interface which supports command-line editing, history, \\\
-    authentication and callbacks for a user-definable function tree
   URL:=http://libcli.sourceforge.net/
 endef
 
-define Build/Compile
-  $(call Build/Compile/Default, DESTDIR="$(PKG_INSTALL_DIR)" all install)
+define Package/libcli/description
+	Libcli provides a shared library for including a Cisco-like 
+	command-line interface into other software. It's a telnet 
+	interface which supports command-line editing, history, 
+	authentication and callbacks for a user-definable function tree.
 endef
 
-define Package/libcli/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli.so.* $(1)/usr/lib
-endef
+MAKE_FLAGS += \
+	OPTIM="$(TARGET_CFLAGS)" \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	all install 
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libcli.h $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli.so* $(STAGING_DIR)/usr/lib/
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libcli.h $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli.so* $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/libcli.h \
-		$(STAGING_DIR)/usr/lib/libcli.so*
+define Package/libcli/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libcli))