Update dbus package to version 1.2.3

[openwrt/svn-archive/archive.git] / utils / dbus / Makefile

diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile
index 9564d3dd2143c52c78b1eb559c7c8d144514a616..24f0997e8ef2b4db9c3955c96d9b7efcc63d4d48 100644 (file)
--- a/utils/dbus/Makefile
+++ b/utils/dbus/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,21 +9,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dbus
-PKG_VERSION:=1.0.2
-PKG_RELEASE:=1
+PKG_VERSION:=1.2.3
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus/
-PKG_MD5SUM:=0552a9b54beb4a044951b7cdbc8fc855
+PKG_MD5SUM:=f71641385768e99361bd298568207cee
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL=1
+
+TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/dbus/Default
- SECTION:=utils
- CATEGORY:=Utilities
- TITLE:=Simple interprocess messaging system
- URL:=http://dbus.freedesktop.org/
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Simple interprocess messaging system
+  URL:=http://dbus.freedesktop.org/
 endef
 
 define Package/dbus/Default/description
@@ -73,34 +76,32 @@ CONFIGURE_ARGS += \
        --disable-tests \
        --disable-verbose-mode \
        --disable-xml-docs \
-       --without-x \
        --with-xml="expat" \
        --with-dbus-user=root \
        --with-dbus-daemondir="/usr/sbin" \
        --with-system-socket="/var/run/dbus/system_bus_socket" \
        --with-system-pid-file="/var/run/dbus.pid" \
+       --without-x
 
 CONFIGURE_VARS+= \
        ac_cv_have_abstract_sockets="yes" \
 
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Build/InstallDev
-       mkdir -p $(1)/usr/include
-       $(CP)   $(PKG_INSTALL_DIR)/usr/include/dbus-1.0 \
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/include/dbus-1.0 \
                $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.{a,so*} \
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.{a,so*} \
                $(1)/usr/lib/
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/dbus-1.0 \
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/dbus-1.0 \
                $(1)/usr/lib/
-       mkdir -p $(1)/usr/lib/pkgconfig
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbus-1.pc \
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbus-1.pc \
                $(1)/usr/lib/pkgconfig/
 endef