Merge branch 'site-modules' of https://github.com/FreifunkBremen/gluon

Makefile

@@ -143,6 +143,7 @@ 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
 	+$(GLUONMAKE) refresh_feeds V=s$(OPENWRT_VERBOSE)
 

scripts/modules.sh

 . "$1"/modules
+[ ! -f "$1"/site/modules ] || . "$1"/site/modules
 
 GLUON_MODULES=openwrt
 
-for feed in $GLUON_FEEDS; do
+for feed in $GLUON_SITE_FEEDS $GLUON_FEEDS; do
 	GLUON_MODULES="$GLUON_MODULES packages/$feed"
 done