From 989aa25c63f9aadd34247ea507f2d5a80ad8f1ec Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 22 Sep 2007 15:44:29 +0000
Subject: [PATCH] add libtool fixes, cleanup

SVN-Revision: 8951
---
 libs/libosip2/Makefile | 45 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/libs/libosip2/Makefile b/libs/libosip2/Makefile
index b281a0bc58..4d579295a7 100644
--- a/libs/libosip2/Makefile
+++ b/libs/libosip2/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006,2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -15,39 +15,39 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/osip
 PKG_MD5SUM:=f1237af0250c59b318bd64a59f5750ea
-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
 
 define Package/libosip2
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libpthread
-  TITLE:=The GNU oSIP library
-  DESCRIPTION:=\
-	GNU oSIP library, a Session Initiation Protocol (SIP) implementation.
+  TITLE:=GNU oSIP library
   URL:=http://www.gnu.org/software/osip/
+  DEPENDS:=+libpthread
 endef
 
+define Package/libosip2description
+ GNU oSIP library, a Session Initiation Protocol (SIP) implementation.
+endef
+
+CONFIGURE_ARGS+= \
+	--enable-shared \
+	--enable-static \
+	--disable-debug \
+	--disable-trace \
+	--enable-pthread \
+	--enable-semaphore \
+	--enable-ntimer \
+
 define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--disable-debug \
-		--disable-trace \
-		--enable-pthread \
-		--enable-semaphore \
-		--enable-ntimer \
-	)
+	$(call Build/Configure/Default)
+	$(call libtool_disable_rpath)
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+	$(MAKE) -C $(PKG_BUILD_DIR) all
+	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
 define Build/InstallDev
@@ -60,8 +60,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/osip{,parser}2 \
+	rm -rf	$(STAGING_DIR)/usr/include/osip{,parser}2 \
 		$(STAGING_DIR)/usr/lib/libosip{,parser}2.{a,so*} \
 		$(STAGING_DIR)/usr/lib/pkgconfig/libosip2.pc
 endef
-- 
2.30.2