merge: properly remove %n / %N references

[openwrt/openwrt.git] / include / feeds.mk

diff --git a/include/feeds.mk b/include/feeds.mk
index f89687a27e61397d8e718b41ea2c84690640f849..b85438301cafd11c322fa5951bbda19de7cb1420 100644 (file)
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -41,10 +41,10 @@ endef
 # 1: destination file
 define FeedSourcesAppend
 ( \
 # 1: destination file
 define FeedSourcesAppend
 ( \

-  echo "src/gz %n_core %U/targets/%S/packages"; \
+  echo "src/gz %d_core %U/targets/%S/packages"; \

   $(strip $(if $(CONFIG_PER_FEED_REPO), \
   $(strip $(if $(CONFIG_PER_FEED_REPO), \

-       $(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %n_$(feed) %U/packages/%A/$(feed)";) \
+       $(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %d_$(feed) %U/packages/%A/$(feed)";) \

        $(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \
        $(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \

-               $(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$(feed) %U/packages/%A/$(feed)";)))) \
+               $(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %d_$(feed) %U/packages/%A/$(feed)";)))) \

 ) >> $(1)
 endef
 ) >> $(1)
 endef