update makefile
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
0961e003be
commit
b34a40b9e8
1 changed files with 6 additions and 8 deletions
14
Makefile
14
Makefile
|
@ -63,7 +63,8 @@ all:
|
||||||
|
|
||||||
man: doc/man/.marker
|
man: doc/man/.marker
|
||||||
|
|
||||||
doc/man/.marker: $(MANDIR)/cdist-reference.text
|
# FIXME: also depends on conf/type/*/man.text!
|
||||||
|
doc/man/.marker: manmove
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
# Manual from core
|
# Manual from core
|
||||||
|
@ -75,7 +76,7 @@ mantype:
|
||||||
for man in conf/type/*/man.text; do $(A2XM) $$man; $(A2XH) $$man; done
|
for man in conf/type/*/man.text; do $(A2XM) $$man; $(A2XH) $$man; done
|
||||||
|
|
||||||
# Move into manpath directories
|
# Move into manpath directories
|
||||||
manmove: mantype mancore
|
manmove: mantype mancore $(MANGENERATED)
|
||||||
for manpage in $(MANDIR)/*.[1-9] conf/type/*/*.7; do \
|
for manpage in $(MANDIR)/*.[1-9] conf/type/*/*.7; do \
|
||||||
cat=$${manpage##*.}; \
|
cat=$${manpage##*.}; \
|
||||||
mandir=$(MANDIR)/man$$cat; \
|
mandir=$(MANDIR)/man$$cat; \
|
||||||
|
@ -91,15 +92,13 @@ manmove: mantype mancore
|
||||||
done
|
done
|
||||||
|
|
||||||
# Reference depends on conf/type/*/man.text - HOWTO with posix make?
|
# Reference depends on conf/type/*/man.text - HOWTO with posix make?
|
||||||
$(MANDIR)/cdist-reference.text: manmove $(MANDIR)/cdist-reference.text.sh
|
$(MANDIR)/cdist-reference.text: $(MANDIR)/cdist-reference.text.sh
|
||||||
$(MANDIR)/cdist-reference.text.sh
|
$(MANDIR)/cdist-reference.text.sh
|
||||||
$(A2XM) $(MANDIR)/cdist-reference.text
|
$(A2XM) $(MANDIR)/cdist-reference.text
|
||||||
$(A2XH) $(MANDIR)/cdist-reference.text
|
$(A2XH) $(MANDIR)/cdist-reference.text
|
||||||
# Move us to the destination as well
|
|
||||||
make manmove
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf doc/man/*.html doc/man/*.[1-9] doc/man/man[1-9] $(MANGENERATED)
|
rm -rf doc/man/html/* doc/man/*.[1-9] doc/man/man[1-9] $(MANGENERATED)
|
||||||
rm -f conf/type/*/man.html
|
rm -f conf/type/*/man.html
|
||||||
rm -rf doc/html
|
rm -rf doc/html
|
||||||
|
|
||||||
|
@ -115,8 +114,7 @@ test:
|
||||||
# gentoo
|
# gentoo
|
||||||
.rsync nicosc@ru3.inf.ethz.ch:cdist
|
.rsync nicosc@ru3.inf.ethz.ch:cdist
|
||||||
|
|
||||||
#web: manmove
|
web: man
|
||||||
web:
|
|
||||||
cp README $(WEBDIR)/$(WEBPAGE)
|
cp README $(WEBDIR)/$(WEBPAGE)
|
||||||
cp -r doc/html/* $(WEBDIR)/$(WEBBASE)/man
|
cp -r doc/html/* $(WEBDIR)/$(WEBBASE)/man
|
||||||
cd $(WEBDIR) && git commit -m "cdist update" $(WEBBASE) $(WEBPAGE)
|
cd $(WEBDIR) && git commit -m "cdist update" $(WEBBASE) $(WEBPAGE)
|
||||||
|
|
Loading…
Reference in a new issue