X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Frootfs.mk;h=76425c017a8b33340dbcc41cecaf1241352c7dbc;hb=d05967baecca33774ab95d4ffabbcb4cc9d0a1bf;hp=a3a08c2851cd0a377e36284c69e1518e94b694cc;hpb=6ab50bb10ded770f023e14d63cac2522076f9daf;p=openwrt%2Fopenwrt.git

diff --git a/include/rootfs.mk b/include/rootfs.mk
index a3a08c2851..76425c017a 100644
--- a/include/rootfs.mk
+++ b/include/rootfs.mk
@@ -1,5 +1,3 @@
-include $(INCLUDE_DIR)/feeds.mk
-
 ifdef CONFIG_USE_MKLIBS
   define mklibs
 	rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out
@@ -63,9 +61,9 @@ ifdef CONFIG_CLEAN_IPKG
 endif
 
 define prepare_rootfs
-	@if [ -d $(TOPDIR)/files ]; then \
-		$(call file_copy,$(TOPDIR)/files/.,$(1)); \
-	fi
+	$(if $(2),@if [ -d '$(2)' ]; then \
+		$(call file_copy,$(2)/.,$(1)); \
+	fi)
 	@mkdir -p $(1)/etc/rc.d
 	@mkdir -p $(1)/var/lock
 	@( \