Rename *_UNDERLAYS -> *_MODULES in Makefile.

1 files changed, 10 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index d70399b..73ce1bd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,24 @@
 SOURCES = ikiwiki
 
 ikiwiki_ORIGIN = http://source.jones.dk/ikiwiki_MODULE.git
-ikiwiki_UNDERLAYS = basewiki smiley templates
+ikiwiki_MODULES = basewiki smiley templates
 ikiwiki_BRANCH = master-LOCALE
 ikiwiki_LOCALES = da
 
-#dummy_UNDERLAYS = content_dummy
+#dummy_MODULES = content_dummy
 
 # Everything after this is generic
 
-underlays_l10n = $(foreach source, $(SOURCES), $(foreach locale, $($(source)_LOCALES), $(patsubst %,%_l10n/$(locale),$($(source)_UNDERLAYS))))
-underlays = $(foreach source, $(SOURCES), $($(source)_UNDERLAYS)) $(underlays_l10n)
+underlays_l10n = $(foreach source, $(SOURCES), $(foreach locale, $($(source)_LOCALES), $(patsubst %,%_l10n/$(locale),$($(source)_MODULES))))
+underlays = $(foreach source, $(SOURCES), $($(source)_MODULES)) $(underlays_l10n)
 
 # FIXME: Handle translation of templates (needs po4a parser for HTML::Template markup)
-#potfiles = $(foreach source, $(SOURCES), $(patsubst %,po/%.pot,$($(source)_UNDERLAYS)))
-potfiles = $(foreach source, $(SOURCES), $(patsubst %,po/%.pot,$(filter-out templates,$($(source)_UNDERLAYS))))
+#potfiles = $(foreach source, $(SOURCES), $(patsubst %,po/%.pot,$($(source)_MODULES)))
+potfiles = $(foreach source, $(SOURCES), $(patsubst %,po/%.pot,$(filter-out templates,$($(source)_MODULES))))
 pofiles = $(foreach source, $(SOURCES), $(foreach locale, $($(source)_LOCALES), $(patsubst %.pot,%.$(locale).po,$(potfiles))))
 l10nfiles = $(foreach source, $(SOURCES), $(foreach locale, $($(source)_LOCALES), $(foreach underlay,$(patsubst po/%.$(locale).po,%,$(pofiles)), $(patsubst %,$(l10ndir)/%,$(l10nfiles_in_underlay)))))
 
-source_of_underlay = $(firstword $(foreach source, $(SOURCES), $(if $(filter $(underlay),$($(source)_UNDERLAYS)),$(source))))
+source_of_underlay = $(firstword $(foreach source, $(SOURCES), $(if $(filter $(underlay),$($(source)_MODULES)),$(source))))
 origin = $(subst MODULE,$(underlay),$($(source_of_underlay)_ORIGIN))
 master = $(subst -LOCALE,$(locale:%=-$(locale)),$($(source_of_underlay)_BRANCH))
 
@@ -29,7 +29,7 @@ fileformat = $(if $(filter templates,$(underlay)),htmltemplate,text)
 filetype = $(if $(filter templates,$(underlay)),tmpl,mdwn)
 l10nfiles_in_underlay = $(shell cd "$(masterdir)" && find * -type f -name '*.$(filetype)')
 
-all: $(underlays) $(dummy_UNDERLAYS)
+all: $(underlays) $(dummy_MODULES)
 
 $(underlays): locale=$(if $(filter l10n/,$(lastword $(subst _, ,$(dir $@)))),$(notdir $@))
 $(underlays): underlay=$(@:%_l10n/$(locale)=%)
@@ -78,7 +78,7 @@ else
 	cd "$(l10ndir)" && po4a-translate -M UTF-8 -L UTF-8 -k 100 -f $(fileformat) -m $(CURDIR)/$(patsubst $(l10ndir)/%,$(masterdir)/%,$@) -p $(CURDIR)/po/$(underlay).$(locale).po -l $(CURDIR)/$@
 endif
 
-$(dummy_UNDERLAYS):
+$(dummy_MODULES):
 	mkdir -p $@
 
 install:
@@ -89,7 +89,7 @@ install:
 ultraclean:
 	rm -rf $(underlays)
 	rm -rf $(dir $(underlays_l10n))
-	rm -rf $(dummy_UNDERLAYS)
+	rm -rf $(dummy_MODULES)
 
 
 .PHONY: pot po translations $(underlays)