pass index file to gallery/rss
(instead of trying to escape the strings inside in make & on the command line)
This commit is contained in:
parent
161cb48d3a
commit
28fc9db3e0
6 changed files with 63 additions and 67 deletions
19
Makefile
19
Makefile
|
@ -139,13 +139,13 @@ $(MAKEPAGES) $(MPFLAGS) depend-single \
|
|||
endef
|
||||
|
||||
# args
|
||||
# 1. title
|
||||
# 1. index file
|
||||
# 2. gallery prefix
|
||||
# 3. other flags
|
||||
define gallery
|
||||
echo "[gallery] "$@
|
||||
mkdir -p "$(dir $@)"
|
||||
$(MAKEPAGES) $(MPFLAGS) gallery -t "$(1)" -p "$(2)" $(3) -o "$@" \
|
||||
$(MAKEPAGES) $(MPFLAGS) gallery -i "$(1)" -p "$(2)" $(3) -o "$@" \
|
||||
$(filter $(DATADIR)/%/$(INFONAME),$^)
|
||||
endef
|
||||
|
||||
|
@ -159,21 +159,18 @@ $(MAKEPAGES) $(MPFLAGS) single -D "$(1)" $< -o "$@" $(2)
|
|||
endef
|
||||
|
||||
# args:
|
||||
# 1. title with commas replaced with $(comma)
|
||||
# 2. description with commas replaced
|
||||
# 3. gallery prefix
|
||||
# 4. data dir
|
||||
# 5. other flags
|
||||
# 1. index file
|
||||
# 2. gallery prefix
|
||||
# 3. data dir
|
||||
# 4. other flags
|
||||
define rss
|
||||
echo "[rss] "$@
|
||||
mkdir -p "$(dir $@)"
|
||||
$(MAKEPAGES) $(MPFLAGS) rss -t "$(1)" -d "$(2)" \
|
||||
-R "$(ROOT)" -p "$(3)" -D "$(4)" -o "$@" $(5) \
|
||||
$(MAKEPAGES) $(MPFLAGS) rss -i "$(1)" \
|
||||
-R "$(ROOT)" -p "$(2)" -D "$(3)" -o "$@" $(4) \
|
||||
$(filter $(DATADIR)/%/$(INFONAME),$^)
|
||||
endef
|
||||
|
||||
comma := ,
|
||||
|
||||
|
||||
# never delete intermediate files
|
||||
.SECONDARY:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue