rework the site repo layout again for fun (and easier building)
This commit is contained in:
parent
6e8ed79937
commit
ebddb7d986
6 changed files with 13 additions and 8 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -2,3 +2,4 @@
|
||||||
/site.conf
|
/site.conf
|
||||||
/site.mk
|
/site.mk
|
||||||
/modules
|
/modules
|
||||||
|
sites/
|
||||||
|
|
14
Makefile
14
Makefile
|
@ -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
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
rm -f site.mk site.conf modules
|
rm -f site.mk site.conf modules
|
||||||
|
|
||||||
modules:
|
modules:
|
||||||
erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
|
erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
|
||||||
|
|
||||||
site.conf:
|
site.conf:
|
||||||
erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
|
erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
|
||||||
|
|
||||||
site.mk:
|
site.mk:
|
||||||
erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
|
erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
cd gluon
|
cd gluon
|
||||||
git clone https://github.com/freifunkhamburg/site-ffhh.git site # Get the Freifunk Hamburg site repository
|
git clone https://github.com/freifunkhamburg/site-ffhh.git site # Get the Freifunk Hamburg site repository
|
||||||
cd site
|
cd site
|
||||||
make SITE=ffhh
|
make
|
||||||
cd ..
|
cd ..
|
||||||
make update # Get other repositories used by Gluon
|
make update # Get other repositories used by Gluon
|
||||||
make # Build 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.
|
Please see [the official Gluon repository](https://github.com/freifunk-gluon/gluon) for an in-depth explanation of the build process.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue