fix 2.4 build error introduced by changeset:2606

[openwrt.git] / openwrt / package / bind / Makefile

diff --git a/openwrt/package/bind/Makefile b/openwrt/package/bind/Makefile
index d65d191..eeb428a 100644 (file)
--- a/openwrt/package/bind/Makefile
+++ b/openwrt/package/bind/Makefile
@@ -20,7 +20,7 @@ include $(TOPDIR)/package/rules.mk
 $(eval $(call PKG_template,BIND_SERVER,bind-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,BIND_CLIENT,bind-client,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(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="$(strip $(TARGET_CFLAGS))" \
@@ -55,7 +55,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        );
        touch $(PKG_BUILD_DIR)/.configured
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR)/lib/dns \
                CC="$(HOSTCC)" \
                CFLAGS="-O2" \
@@ -65,7 +65,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
-       touch $(PKG_BUILD_DIR)/.built
+       touch $@
 
 $(IPKG_BIND_SERVER):
        install -d -m0755 $(IDIR_BIND_SERVER)/usr/sbin
@@ -73,6 +73,7 @@ $(IPKG_BIND_SERVER):
        cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/named $(IDIR_BIND_SERVER)/usr/sbin/
        cp -fpR files/bind $(IDIR_BIND_SERVER)/etc
        cp -fpR files/named.init $(IDIR_BIND_SERVER)/etc/init.d/S$(PKG_INIT_LEVEL)named
+       find $(IDIR_BIND_SERVER)/etc/bind -name ".svn" | xargs rm -rf
        $(RSTRIP) $(IDIR_BIND_SERVER)
        $(IPKG_BUILD) $(IDIR_BIND_SERVER) $(PACKAGE_DIR)