fix various makefile errors (#1236)

[openwrt/svn-archive/archive.git] / libs / libcli / Makefile

diff --git a/libs/libcli/Makefile b/libs/libcli/Makefile
old mode 100755 (executable)
new mode 100644 (file)
index 1f2c69c..621771a
--- a/libs/libcli/Makefile
+++ b/libs/libcli/Makefile
@@ -12,12 +12,12 @@ 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,21 +26,21 @@ 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
+  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.
   URL:=http://libcli.sourceforge.net/
 endef
 
 define Build/Compile
-  $(call Build/Compile/Default, DESTDIR="$(PKG_INSTALL_DIR)" all install)
-endef
-
-define Package/libcli/install
-       install -d -m0755 $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli.so.* $(1)/usr/lib
+       rm -rf $(PKG_INSTALL_DIR)
+       $(call Build/Compile/Default, \
+               OPTIM="$(TARGET_CFLAGS)" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install \
+       )
 endef
 
 define Build/InstallDev
@@ -51,9 +51,13 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/libcli.h \
+       rm -rf  $(STAGING_DIR)/usr/include/libcli.h \
                $(STAGING_DIR)/usr/lib/libcli.so*
 endef
 
+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))