diff options
| author | Siri Reiter <siri@jones.dk> | 2017-02-05 21:01:55 +0100 |
|---|---|---|
| committer | Siri Reiter <siri@jones.dk> | 2017-02-05 21:04:16 +0100 |
| commit | 74469d030df5ef0cab6f00bec792e6300e080151 (patch) | |
| tree | ac2fb15b7d30a9e270f62f50ee6de9f9b95645f9 | |
| parent | e9db1dd938911007d3f11f2793510c4f14401f5e (diff) | |
| parent | 8718431b6266fe18fabf6c290a397b1e23b45562 (diff) | |
Merge remote-tracking branch 'iki/plaintitle-da'
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | config/ikiwiki.setup.in | 10 | ||||
| m--------- | shared | 0 |
4 files changed, 18 insertions, 2 deletions
@@ -38,7 +38,13 @@ config/ikiwiki.setup.in: configfiles: $(iki_configfiles) $(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%)) $(iki_configfiles): % : %.in - ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ + ikiwiki $(IKIWIKI_DEFAULTS) \ + $(if $(IKIWIKI_UNDERLAYS)$(IKIWIKI_SHARED_UNDERLAYS),\ + --set-yaml add_underlays="$$(echo $(strip \ + $(IKIWIKI_UNDERLAYS) \ + $(IKIWIKI_SHARED_UNDERLAYS)) \ + | perl -pe 's/\s+/\n/g;s/^/- /gm')") \ + $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ perl -i -pe '$$s=$$ENV{'CURDIR'}; s/\@CURDIR\@/$$s/g' $@ content: notempty = $(wildcard $@/*.mdwn) @@ -3,7 +3,7 @@ Ikiwiki build environment To quickly start working with content, this should suffice: - git clone git://source.jones.dk/ikiwiki/site + git clone git://source.jones.dk/ikiwiki cd site make init make diff --git a/config/ikiwiki.setup.in b/config/ikiwiki.setup.in index dbd794e..85a75f4 100644 --- a/config/ikiwiki.setup.in +++ b/config/ikiwiki.setup.in @@ -1,4 +1,14 @@ # IkiWiki::Setup::Yaml - YAML formatted setup file +# +# Seed info for creating ikiwiki setup file. +# +# Passing this to ikiwiki --setup ... --dumpsetup will make ikiwiki +# generate its setup file. +# +# Remember to remove ikiwiki.setup and re-run make init any time you +# edit this file. +# +# name of the wiki wikiname: Byvandring Nu adminemail: paul@hartvigson.dk adminuser: diff --git a/shared b/shared -Subproject 0dc5024b0c18e330829e407f0f3a8330eafd6cb +Subproject 15cba4b6b8888557b868db8008f8137e6f65093 |