Allow explicit setting of doc formats to build or full disabling.

Signed-off-by: default avatarAgustin Martin Domingo <agmartin@debian.org>
parent 9fa7b96b
......@@ -12,8 +12,8 @@ please see "doc/CHANGES.Debian-native".
rtf2rtf.l.
* Build documentation in build target, not in install target
(Debian #800537).
* More versatile handling of doc formats. Add pdf format and built it
instead of dvi+ps.
* More versatile handling of doc formats, allowing explicit selection or
full disabling. Add pdf format and built it instead of dvi+ps.
0.9.69:
=======
......
......@@ -39,13 +39,22 @@ o Configure linuxdoc-tools for your system:
./configure --with-installed-iso-entities
Other interesting configuration options
--disable-docs No not build or install any doc
--enable-docs[=type] Explicitly set doc formats to build.
Possible values:
txt pdf info lyx html rtf dvi+ps.
(Default: enabled with "txt pdf
info lyx html rtf" value)
o Compile SGML-Tools:
make
or
gmake
whatever calls GNU make on your system. If you don't have GNU make installed,
......@@ -61,8 +70,8 @@ o Install SGML-Tools:
directories).
Note:
In order to use TeX/PS/PDF output, TeX style files in ./lib
subdirectory (linuxdoc-sgml.sty, linuxdoctr-sgml.sty, null.sty,
In order to use TeX/PS/PDF output, TeX style files in ./lib
subdirectory (linuxdoc-sgml.sty, linuxdoctr-sgml.sty, null.sty,
and qwertz.sty) are to be installed your LaTeX input directory,
such as "/usr/share/tex/latex/misc/".
Also url.sty and epsf.tex are required. Newer version of them
......@@ -75,6 +84,5 @@ o Install SGML-Tools:
o the contrib directory has some interesting patches and scripts that may be
useful to you.
o there is a guide on the linuxdoc-tools documentation directory, it
o there is a guide on the linuxdoc-tools documentation directory, it
describes how to use this package, read it next...
......@@ -30,7 +30,7 @@ INSTALL_DATA = @INSTALL_DATA@
BUILD_SGMLSASP = @BUILD_SGMLSASP@
BUILD_ENTITY_MAP = @BUILD_ENTITY_MAP@
BUILD_ISO_ENTITIES = @BUILD_ISO_ENTITIES@
BUILDDOC_FORMATS = txt pdf info lyx html rtf
BUILDDOC_FORMATS = @BUILDDOC_FORMATS@
# Now real destination dirs, honouring $(DESTDIR)
auxbin_ddir = $(DESTDIR)$(auxbindir)
......@@ -88,6 +88,7 @@ endif
> genman/$$bn; \
done
ifneq ($(BUILDDOC_FORMATS),)
# -- Build documentation
@echo "Building documentation ..."
(cd doc; \
......@@ -98,6 +99,7 @@ endif
PKGENTITYMAPDIR=$(CURDIR)/entity-map \
BUILDDOC_FORMATS="$(BUILDDOC_FORMATS)" \
bash Makedoc.sh)
endif
install:: bin/linuxdoc
@echo "Installing binaries in $(bin_ddir) ..."
......@@ -175,6 +177,7 @@ endif
mkdir -m 755 -p $(tex_ddir)
$(INSTALL_DATA) tex/* $(tex_ddir)
ifneq ($(BUILDDOC_FORMATS),)
# -- Install documentation
mkdir -m 755 -p $(doc_ddir)
# cp -r doc/* $(doc_ddir)
......@@ -182,6 +185,7 @@ endif
rm -f $(doc_ddir)/Makedoc.sh
find $(doc_ddir) -type d -print | xargs chmod 755
find $(doc_ddir) -type f -print | xargs chmod 644
endif
# what dirs do the targets clean and distclean need?
DDIRS=
......
......@@ -586,6 +586,7 @@ enable_option_checking=no
ac_subst_vars='LTLIBOBJS
LIBOBJS
subdirs
BUILDDOC_FORMATS
texdir
perl5libdir
pkgdatadir
......@@ -654,6 +655,7 @@ with_auxbindir
with_pkgdatadir
with_perllibdir
with_texdir
enable_docs
'
ac_precious_vars='build_alias
host_alias
......@@ -1274,6 +1276,16 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-docs[=types] Explicitly set doc formats to build. Possible
values: txt pdf info lyx html rtf dvi+ps.
--disable-docs will disable doc build and
installation. (Default: enabled with "txt pdf info
lyx html rtf" value)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
......@@ -2187,6 +2199,21 @@ fi
BUILDDOC_FORMATS="txt pdf info lyx html rtf"
# Check whether --enable-docs was given.
if test "${enable_docs+set}" = set; then :
enableval=$enable_docs; if test "x$enableval" != "xyes"; then
if test "x$enableval" = "xno"; then
BUILDDOC_FORMATS=""
else
BUILDDOC_FORMATS="$enableval"
fi
fi
fi
if test "$BUILD_NSGMLS" = "true"
then
......
......@@ -129,6 +129,25 @@ AC_ARG_WITH(texdir,
)
AC_SUBST(texdir)
dnl ------ Allow explicit setting of doc formats to build -----
BUILDDOC_FORMATS="txt pdf info lyx html rtf"
AC_ARG_ENABLE(docs,
[AS_HELP_STRING([--enable-docs[[=types]]],
[Explicitly set doc formats to build.
Possible values: txt pdf info lyx html rtf dvi+ps.
--disable-docs will disable doc build and installation.
(Default: enabled with "txt pdf info lyx html rtf" value)]
)],
[if test "x$enableval" != "xyes"; then
if test "x$enableval" = "xno"; then
BUILDDOC_FORMATS=""
else
BUILDDOC_FORMATS="$enableval"
fi
fi]
)
AC_SUBST(BUILDDOC_FORMATS)
dnl ------ Create list of possible extra subdirs -----------
if test "$BUILD_NSGMLS" = "true"
then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment