From 5163d8b355a6afa6eb53fbfe907de4c9010a09af Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 17 Nov 2011 11:49:08 +0000 Subject: [PATCH] packages/bluez-utils: rename uci config file, cleanup git-svn-id: svn://svn.openwrt.org/openwrt/packages@29231 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- utils/bluez-utils/Makefile | 14 ++++++-------- .../bluez-utils/files/{bluetooth.conf => bluetooth.config} | 0 2 files changed, 6 insertions(+), 8 deletions(-) rename utils/bluez-utils/files/{bluetooth.conf => bluetooth.config} (100%) diff --git a/utils/bluez-utils/Makefile b/utils/bluez-utils/Makefile index 5b4dbee4e..c0a0f6ea7 100644 --- a/utils/bluez-utils/Makefile +++ b/utils/bluez-utils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bluez-utils PKG_VERSION:=3.36 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://bluez.sourceforge.net/download @@ -56,18 +56,16 @@ define Build/Compile all install endef -#copy bluetooth.conf nach /etc/dbus-1/system.d/ - define Package/bluez-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/bluetooth - $(CP) $(PKG_INSTALL_DIR)/../hcid/hcid.conf $(1)/etc/bluetooth/ - $(CP) $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf $(1)/etc/bluetooth/ + $(CP) $(PKG_INSTALL_DIR)/etc/bluetooth/hcid/hcid.conf $(1)/etc/bluetooth/ + $(CP) $(PKG_INSTALL_DIR)/etc/bluetooth/rfcomm/rfcomm.conf $(1)/etc/bluetooth/ $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/bluetooth.conf $(1)/etc/config/bluetooth + $(INSTALL_DATA) ./files/bluetooth.config $(1)/etc/config/bluetooth $(INSTALL_DIR) $(1)/etc/dbus-1/system.d/ $(INSTALL_DATA) ./files/bluetooth.dbus $(1)/etc/dbus-1/system.d/bluetooth.conf $(INSTALL_DIR) $(1)/etc/init.d diff --git a/utils/bluez-utils/files/bluetooth.conf b/utils/bluez-utils/files/bluetooth.config similarity index 100% rename from utils/bluez-utils/files/bluetooth.conf rename to utils/bluez-utils/files/bluetooth.config -- 2.11.0