[packages] Fix linking of libsdl_{mixer,sound}

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

diff --git a/libs/libol/Makefile b/libs/libol/Makefile
index b0a2b30851c32e9c6cc0dc5aa159280001bc0657..2ef6d92ef91422697d8c42d041ceb32411f3a2e4 100644 (file)
--- a/libs/libol/Makefile
+++ b/libs/libol/Makefile
@@ -1,21 +1,22 @@
 #
-# Copyright (C) 2006-2008 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.18
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.balabit.com/downloads/libol/0.3
+PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/libol/0.3
 PKG_MD5SUM:=cbadf4b7ea276dfa85acc38a1cc5ff17
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -35,13 +36,8 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
-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
+# pass CFLAGS again to override -O2 set by configure
+MAKE_ARGS += CFLAGS="$(TARGET_CFLAGS)"
 
 define Build/InstallDev
        $(INSTALL_DIR) $(2)/bin
@@ -58,15 +54,15 @@ define Build/InstallDev
                $(1)/usr/include/libol/
 
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/libol.{la,so*} \
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libol.{a,la,so*} \
                $(1)/usr/lib/
 endef
 
 define Package/libol/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/libol.{a,so*} \
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libol.so* \
                $(1)/usr/lib/
 endef