X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b30ef16d9a00a6e43661b02d4e40fc2032ca5953..c3001723cbd07c232d514eec233336a1978ce159:/package/bind/Makefile

diff --git a/package/bind/Makefile b/package/bind/Makefile
index d65d19196..ba895f3c0 100644
--- a/package/bind/Makefile
+++ b/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,19 +65,20 @@ $(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
 	install -d -m0755 $(IDIR_BIND_SERVER)/etc/init.d
-	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
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/named $(IDIR_BIND_SERVER)/usr/sbin/
+	$(CP) files/bind $(IDIR_BIND_SERVER)/etc
+	$(CP) 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)
 
 $(IPKG_BIND_CLIENT):
 	install -d -m0755 $(IDIR_BIND_CLIENT)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(IDIR_BIND_CLIENT)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(IDIR_BIND_CLIENT)/usr/bin/
 	$(RSTRIP) $(IDIR_BIND_CLIENT)
 	$(IPKG_BUILD) $(IDIR_BIND_CLIENT) $(PACKAGE_DIR)