mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1066 from adevress/disable-doc

Browse source 
Add a new option to disable documentation generation at configure time
This commit is contained in:
Eelco Dolstra 2016-09-20 18:13:41 +02:00 committed by GitHub
commit 3fcfd899f8
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.config.in
View file

@ -33,5 +33,6 @@ pkglibdir = $(libdir)/$(PACKAGE_NAME)
prefix = @prefix@ prefix = @prefix@
storedir = @storedir@ storedir = @storedir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
doc_generate = @doc_generate@
xmllint = @xmllint@ xmllint = @xmllint@
xsltproc = @xsltproc@ xsltproc = @xsltproc@

7
configure.ac
View file

@ -265,6 +265,13 @@ AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state],
#AM_CONDITIONAL(INIT_STATE, test "$init_state" = "yes") #AM_CONDITIONAL(INIT_STATE, test "$init_state" = "yes")
# documentation generation switch
AC_ARG_ENABLE(doc-gen, AC_HELP_STRING([--disable-doc-gen],
[disable documentation generation]),
doc_generate=$enableval, doc_generate=yes)
AC_SUBST(doc_generate)
# Setuid installations. # Setuid installations.
AC_CHECK_FUNCS([setresuid setreuid lchown]) AC_CHECK_FUNCS([setresuid setreuid lchown])

9
doc/manual/local.mk
View file

@ -1,3 +1,6 @@
ifeq ($(doc_generate),yes)
XSLTPROC = $(xsltproc) --nonet $(xmlflags) \ XSLTPROC = $(xsltproc) --nonet $(xmlflags) \
--param section.autolabel 1 \ --param section.autolabel 1 \
--param section.label.includes.component.label 1 \ --param section.label.includes.component.label 1 \
@ -71,8 +74,14 @@ $(foreach file, $(wildcard $(d)/images/callouts/*.gif), $(eval $(call install-da
$(eval $(call install-symlink, manual.html, $(docdir)/manual/index.html)) $(eval $(call install-symlink, manual.html, $(docdir)/manual/index.html))
all: $(d)/manual.html all: $(d)/manual.html
clean-files += $(d)/manual.html clean-files += $(d)/manual.html
dist-files += $(d)/manual.html dist-files += $(d)/manual.html
endif