Merge branch 'rel/5.1'
This commit is contained in:
commit
c3d0b01b7f
293 changed files with 6907 additions and 34130 deletions
|
@ -10,23 +10,23 @@
|
|||
if WANT_GUI
|
||||
GUI_MANS = core-gui.1
|
||||
endif
|
||||
|
||||
if WANT_DAEMON
|
||||
DAEMON_MANS = vnoded.1 vcmd.1 netns.1 core-daemon.1 coresendmsg.1 \
|
||||
core-cleanup.1 core-xen-cleanup.1 core-manage.1
|
||||
core-cleanup.1 core-manage.1
|
||||
endif
|
||||
man_MANS = $(GUI_MANS) $(DAEMON_MANS)
|
||||
|
||||
.PHONY: generate-mans
|
||||
generate-mans:
|
||||
$(HELP2MAN) --source CORE 'sh $(top_srcdir)/gui/core-gui' -o core-gui.1.new
|
||||
$(HELP2MAN) --no-info --source CORE $(top_srcdir)/daemon/src/vnoded -o vnoded.1.new
|
||||
$(HELP2MAN) --no-info --source CORE $(top_srcdir)/daemon/src/vcmd -o vcmd.1.new
|
||||
$(HELP2MAN) --no-info --source CORE $(top_srcdir)/daemon/src/netns -o netns.1.new
|
||||
$(HELP2MAN) --version-string=$(CORE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/sbin/core-daemon -o core-daemon.1.new
|
||||
$(HELP2MAN) --version-string=$(CORE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/sbin/coresendmsg -o coresendmsg.1.new
|
||||
$(HELP2MAN) --version-string=$(CORE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/sbin/core-cleanup -o core-cleanup.1.new
|
||||
$(HELP2MAN) --version-string=$(CORE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/sbin/core-xen-cleanup -o core-xen-cleanup.1.new
|
||||
$(HELP2MAN) --version-string=$(CORE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/sbin/core-manage -o core-manage.1.new
|
||||
$(HELP2MAN) --no-info --source CORE $(top_srcdir)/netns/vnoded -o vnoded.1.new
|
||||
$(HELP2MAN) --no-info --source CORE $(top_srcdir)/netns/vcmd -o vcmd.1.new
|
||||
$(HELP2MAN) --no-info --source CORE $(top_srcdir)/netns/netns -o netns.1.new
|
||||
$(HELP2MAN) --version-string=$(PACKAGE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/scripts/core-daemon -o core-daemon.1.new
|
||||
$(HELP2MAN) --version-string=$(PACKAGE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/scripts/coresendmsg -o coresendmsg.1.new
|
||||
$(HELP2MAN) --version-string=$(PACKAGE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/scripts/core-cleanup -o core-cleanup.1.new
|
||||
$(HELP2MAN) --version-string=$(PACKAGE_VERSION) --no-info --source CORE $(top_srcdir)/daemon/scripts/core-manage -o core-manage.1.new
|
||||
|
||||
.PHONY: diff
|
||||
diff:
|
||||
|
@ -34,5 +34,9 @@ diff:
|
|||
colordiff -u $$m $$m.new | less -R; \
|
||||
done;
|
||||
|
||||
clean-local:
|
||||
-rm -f $(addsuffix .new,$(GUI_MANS))
|
||||
-rm -f $(addsuffix .new,$(DAEMON_MANS))
|
||||
|
||||
DISTCLEANFILES = Makefile.in
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
|
|
|
@ -20,7 +20,6 @@ remove the core-daemon.log file
|
|||
.BR core-gui(1),
|
||||
.BR core-daemon(1),
|
||||
.BR coresendmsg(1),
|
||||
.BR core-xen-cleanup(1),
|
||||
.BR vcmd(1),
|
||||
.BR vnoded(1)
|
||||
.SH BUGS
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue