add gcc4 fix for iptables 1.3.4

[openwrt.git] / package / bluez-utils / Makefile

diff --git a/package/bluez-utils/Makefile b/package/bluez-utils/Makefile
index 40ab279..ab08c22 100644 (file)
--- a/package/bluez-utils/Makefile
+++ b/package/bluez-utils/Makefile
@@ -23,7 +23,7 @@ $(PKG_BUILD_DIR)/.source: $(DL_DIR)/$(PKG_SOURCE)
        zcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
        touch $(BLUEZLIBS_DIR)/.source
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
@@ -61,12 +61,13 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        )
        touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
+       rm -f $(PKG_INSTALL_DIR)/usr/bin/bluepin
        touch $@
 
 $(IPKG_BLUEZ_UTILS):
@@ -75,8 +76,9 @@ $(IPKG_BLUEZ_UTILS):
        install -d -m0755 $(IDIR_BLUEZ_UTILS)/usr/sbin
        cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_BLUEZ_UTILS)/usr/sbin/
        install -d -m0755 $(IDIR_BLUEZ_UTILS)/etc/bluetooth
-       cp -fp $(PKG_INSTALL_DIR)/../hcid/hcid.conf* $(IDIR_BLUEZ_UTILS)/etc/bluetooth/
-       cp -fp $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf* $(IDIR_BLUEZ_UTILS)/etc/bluetooth/
+       cp -fp $(PKG_INSTALL_DIR)/../hcid/hcid.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/
+       cp -fp $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/
+       install -m0700 ./files/givepin $(IDIR_BLUEZ_UTILS)/etc/bluetooth/
 
        $(RSTRIP) $(IDIR_BLUEZ_UTILS)
        $(IPKG_BUILD) $(IDIR_BLUEZ_UTILS) $(PACKAGE_DIR)