diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2011-01-30 18:42:37 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2011-01-30 18:42:37 +0100 |
| commit | 83ab8200c462357f8ca57556cc4aea64fe12a87f (patch) | |
| tree | 73fa7d6c9ef90e9378e218ed02c2509cd162e036 | |
| parent | f4a9dc389f47e79a108c855d19a39acac8ccf7df (diff) | |
| parent | a907eb094c6e160b0ce92d65e43a1fdc87a68ea3 (diff) | |
Merge branch 'master' into allinoneallinone
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,6 +1,7 @@ IKIWIKI_OPTIONS ?= \ --set srcdir=$(CURDIR)/content \ - --set destdir=$(CURDIR)/build/html + --set destdir=$(CURDIR)/build/html \ + $(IKIWIKI_SHARED_OPTIONS) $(IKIWIKI_CONFIG_OPTIONS) -include shared/include.mk -include config/include.mk |