Fix Makefile for dotman target.
This commit is contained in:
parent
f6ea90c3a5
commit
7a9a04592b
1 changed files with 3 additions and 6 deletions
9
Makefile
9
Makefile
|
@ -46,7 +46,8 @@ MAN7DSTDIR=$(MANDIR)/man7
|
||||||
|
|
||||||
# Manpages #1: Types
|
# Manpages #1: Types
|
||||||
# Use shell / ls to get complete list - $(TYPEDIR)/*/man.rst does not work
|
# Use shell / ls to get complete list - $(TYPEDIR)/*/man.rst does not work
|
||||||
MANTYPESRC=$(shell ls $(TYPEDIR)/*/man.rst)
|
# Using ls does not work if no file with given pattern exist, so use wildcard
|
||||||
|
MANTYPESRC=$(wildcard $(TYPEDIR)/*/man.rst)
|
||||||
MANTYPEPREFIX=$(subst $(TYPEDIR)/,$(MAN7DSTDIR)/cdist-type,$(MANTYPESRC))
|
MANTYPEPREFIX=$(subst $(TYPEDIR)/,$(MAN7DSTDIR)/cdist-type,$(MANTYPESRC))
|
||||||
MANTYPES=$(subst /man.rst,.rst,$(MANTYPEPREFIX))
|
MANTYPES=$(subst /man.rst,.rst,$(MANTYPEPREFIX))
|
||||||
|
|
||||||
|
@ -92,13 +93,9 @@ man-latest-link: web-pub
|
||||||
DOT_CDIST_PATH=${HOME}/.cdist
|
DOT_CDIST_PATH=${HOME}/.cdist
|
||||||
DOTMAN7DSTDIR=$(MAN7DSTDIR)
|
DOTMAN7DSTDIR=$(MAN7DSTDIR)
|
||||||
DOTTYPEDIR=$(DOT_CDIST_PATH)/type
|
DOTTYPEDIR=$(DOT_CDIST_PATH)/type
|
||||||
$(info $(DOTTYPEDIR))
|
DOTMANTYPESRC=$(wildcard $(DOTTYPEDIR)/*/man.rst)
|
||||||
DOTMANTYPESRC=$(shell ls $(DOTTYPEDIR)/*/man.rst)
|
|
||||||
$(info $(DOTMANTYPESRC))
|
|
||||||
DOTMANTYPEPREFIX=$(subst $(DOTTYPEDIR)/,$(DOTMAN7DSTDIR)/cdist-type,$(DOTMANTYPESRC))
|
DOTMANTYPEPREFIX=$(subst $(DOTTYPEDIR)/,$(DOTMAN7DSTDIR)/cdist-type,$(DOTMANTYPESRC))
|
||||||
$(info $(DOTMANTYPEPREFIX))
|
|
||||||
DOTMANTYPES=$(subst /man.rst,.rst,$(DOTMANTYPEPREFIX))
|
DOTMANTYPES=$(subst /man.rst,.rst,$(DOTMANTYPEPREFIX))
|
||||||
$(info $(DOTMANTYPES))
|
|
||||||
|
|
||||||
# Link manpage: do not create man.html but correct named file
|
# Link manpage: do not create man.html but correct named file
|
||||||
$(DOTMAN7DSTDIR)/cdist-type%.rst: $(DOTTYPEDIR)/%/man.rst
|
$(DOTMAN7DSTDIR)/cdist-type%.rst: $(DOTTYPEDIR)/%/man.rst
|
||||||
|
|
Loading…
Reference in a new issue