From 8ce95898eb53b7660010c81990318763c6e14057 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 20 Jan 2014 21:01:55 +0100 Subject: [PATCH] Fix generation of feeds.conf for site modules --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a6fedcf0..90bd0d5d 100644 --- a/Makefile +++ b/Makefile @@ -143,8 +143,10 @@ export GLUON_CONFIGURE := $(GLUONDIR)/scripts/configure.pl feeds: FORCE - [ ! -f $(GLUON_SITEDIR)/modules ] || . $(GLUON_SITEDIR)/modules && for feed in $$GLUON_SITE_FEEDS; do echo src-link $$feed ../../packages/$$feed; done > feeds.conf - . $(GLUONDIR)/modules && for feed in $$GLUON_FEEDS; do echo src-link $$feed ../../packages/$$feed; done > feeds.conf + ( \ + [ ! -f $(GLUON_SITEDIR)/modules ] || . $(GLUON_SITEDIR)/modules && for feed in $$GLUON_SITE_FEEDS; do echo src-link $$feed ../../packages/$$feed; done; \ + . $(GLUONDIR)/modules && for feed in $$GLUON_FEEDS; do echo src-link $$feed ../../packages/$$feed; done; \ + ) > feeds.conf +$(GLUONMAKE) refresh_feeds V=s$(OPENWRT_VERBOSE) config: FORCE