rework the site repo layout again for fun (and easier building)

This commit is contained in:
Daniel Frank 2017-10-13 23:47:33 +02:00
parent 6e8ed79937
commit ebddb7d986
6 changed files with 13 additions and 8 deletions

1
.gitignore vendored
View file

@ -2,3 +2,4 @@
/site.conf
/site.mk
/modules
sites/

View file

@ -1,16 +1,20 @@
SITE ?= ffhh
sites: sites/ffhh sites/ffhh-sued
all: clean site.mk site.conf modules
sites/%: config/%.erb
mkdir -p $@
cd $@ && $(MAKE) -f ../../Makefile site SITE=$(@F)
site: clean site.mk site.conf modules
.PHONY: clean
clean:
rm -f site.mk site.conf modules
modules:
erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
site.conf:
erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
site.mk:
erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@

View file

@ -4,10 +4,10 @@
cd gluon
git clone https://github.com/freifunkhamburg/site-ffhh.git site # Get the Freifunk Hamburg site repository
cd site
make SITE=ffhh
make
cd ..
make update # Get other repositories used by Gluon
make # Build Gluon
make update # Get other repositories used by Gluon
make GLUON_SITEDIR=site/sites/ffhh # Build Gluon
Please see [the official Gluon repository](https://github.com/freifunk-gluon/gluon) for an in-depth explanation of the build process.