commit b62fc6b0f89f167e044bd80e81ca17e462fe1b79
Author: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Date:   Fri Feb 27 13:21:32 2015 +0100

    Fix feeds.conf management in Makefile

diff --git a/Makefile b/Makefile
index 75350bb..ec00e15 100644
--- a/Makefile
+++ b/Makefile
@@ -81,8 +81,9 @@ endef
 
 define copy_feeds_file
 	$(if $(1),$(eval FEEDS_DIR=$(1)),$(eval FEEDS_DIR=$(TBUILD)))
-	$(if $(FEEDS_DIR),,$(call target_error))	
-	cat $(BUILD_DIR)/qmp/feeds.conf >> $(BUILD_DIR)/$(FEEDS_DIR)
+	$(if $(FEEDS_DIR),,$(call target_error))
+	cp -f $(BUILD_DIR)/$(FEEDS_DIR)/feeds.conf.default $(BUILD_DIR)/$(FEEDS_DIR)/feeds.conf
+        cat $(BUILD_DIR)/qmp/feeds.conf >> $(BUILD_DIR)/$(FEEDS_DIR)/feeds.conf
 	sed -i -e "s|PATH|`pwd`/$(BUILD_DIR)|" $(BUILD_DIR)/$(FEEDS_DIR)/feeds.conf
 endef