Add vpnc-scripts package with up-to-date script

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

diff --git a/libs/libol/Makefile b/libs/libol/Makefile
index 71f411c67f771e9c9d435668e203e925a4927d32..2ef6d92ef91422697d8c42d041ceb32411f3a2e4 100644 (file)
--- a/libs/libol/Makefile
+++ b/libs/libol/Makefile
@@ -1,24 +1,22 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libol
-PKG_VERSION:=0.3.17
-PKG_RELEASE:=1
+PKG_VERSION:=0.3.18
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.balabit.com/downloads/libol/0.3
-PKG_MD5SUM:=28cc52e84bdb472b7830f9ad120a62a7
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/libol/0.3
+PKG_MD5SUM:=cbadf4b7ea276dfa85acc38a1cc5ff17
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -36,33 +34,36 @@ define Build/Configure
        )
 endef
 
-define Build/Compile
-       # pass CFLAGS again to override -O2 set by configure
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+TARGET_CFLAGS += $(FPIC)
+
+# pass CFLAGS again to override -O2 set by configure
+MAKE_ARGS += CFLAGS="$(TARGET_CFLAGS)"
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libol-config $(STAGING_DIR)/usr/bin/
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/libol $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libol.{*a,so*} $(STAGING_DIR)/usr/lib/
-endef
+       $(INSTALL_DIR) $(2)/bin
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/bin/libol-config \
+               $(2)/bin/
+       $(SED) \
+               's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+               $(2)/bin/libol-config
+
+       $(INSTALL_DIR) $(1)/usr/include/libol
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/libol/*.h \
+               $(1)/usr/include/libol/
 
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/bin/libol-config \
-               $(STAGING_DIR)/usr/include/libol \
-               $(STAGING_DIR)/usr/lib/libol.{*a,so*}
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libol.{a,la,so*} \
+               $(1)/usr/lib/
 endef
 
 define Package/libol/install
-       install -d -m0755 $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libol.so.* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libol.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libol))