diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2012-08-04 19:45:31 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2012-08-04 19:45:31 +0200 |
| commit | 62c8d9128f47a4b7ca09330d9555a2b040f731c3 (patch) | |
| tree | c0fa316aeda4d98087c020b50bcbf8b266947f0e | |
| parent | c04a0e54d61a7512055109bb8942ff081e3b194f (diff) | |
| parent | cc4bcbadbbabb468dd0f78149bc2f227393dd57c (diff) | |
Merge branch 'master' into master-da
| -rw-r--r-- | Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -2,15 +2,14 @@ IKIWIKI_DEFAULTS ?= \ --rcs git \ --set cgi_wrappermode=00755 \ --set git_wrappermode=06755 \ + --set srcdir='@CURDIR@/content' \ + --set destdir='@CURDIR@/build/html$(iki_flavor:%=-%)' \ + --set cgi_wrapper='@CURDIR@/build/cgi$(iki_flavor:%=-%)/ikiwiki.cgi' \ + --set git_wrapper='@CURDIR@/build/git/post-update-ikiwiki$(iki_flavor:%=-%)' \ + --set wikistatedir='@CURDIR@/.ikiwiki$(iki_flavor:%=-%)' \ $(IKIWIKI_SHARED_DEFAULTS) -IKIWIKI_OPTIONS ?= \ - --set srcdir='$(CURDIR)/content' \ - --set destdir='$(CURDIR)/build/html$(iki_flavor:%=-%)' \ - --set cgi_wrapper='$(CURDIR)/build/cgi$(iki_flavor:%=-%)/ikiwiki.cgi' \ - --set git_wrapper='$(CURDIR)/build/git/post-update-ikiwiki$(iki_flavor:%=-%)' \ - --set wikistatedir='$(CURDIR)/.ikiwiki$(iki_flavor:%=-%)' \ - $(IKIWIKI_SHARED_OPTIONS) +export CURDIR cssprojects ?= $(wildcard shared/themes/goab styling) @@ -39,7 +38,8 @@ 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 $<)) $(IKIWIKI_OPTIONS) --dumpsetup $@ + ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ + perl -i -pe '$$s=$$ENV{'CURDIR'}; s/\@CURDIR\@/$$s/g' $@ content: notempty = $(wildcard $@/*.mdwn) content: |