walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Do not install docs when gtk-doc is not installed 

Reported-by: Dagobert Michelsen <dam@opencsw.org>
This commit is contained in:
Tim Rühsen 2015-01-26 13:16:59 +01:00
parent 067f6aee9c
commit 8af7964a08
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -1,10 +1,11 @@
# got some hints from https://gitorious.org/openismus-playground/examplelib/source # got some hints from https://gitorious.org/openismus-playground/examplelib/source
SUBDIRS = po include src tools data docs/libpsl tests SUBDIRS = po include src tools data $(LIBPSL_DOCS) tests
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
# Enable GTK-Doc during make distcheck # Enable GTK-Doc during make distcheck
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man #DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man
## Install the generated pkg-config file (.pc) into the expected location for ## Install the generated pkg-config file (.pc) into the expected location for
## architecture-dependent package configuration information. Occasionally, ## architecture-dependent package configuration information. Occasionally,

10
configure.ac
View File

@ -36,6 +36,12 @@ m4_ifdef([GTK_DOC_USE_LIBTOOL], [], [
AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], false) AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], false)
]) ])
if test x"$have_gtk_doc" = xyes -a x"$enable_gtk_doc" = xyes; then
docdir_makefile=docs/libpsl/Makefile
docdir_version_xml=docs/libpsl/version.xml
AC_SUBST([LIBPSL_DOCS], [docs/libpsl])
fi
# #
# enable creation of man pages # enable creation of man pages
# #
@ -247,8 +253,8 @@ AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
tools/Makefile tools/Makefile
po/Makefile.in po/Makefile.in
docs/libpsl/Makefile ${docdir_makefile}
docs/libpsl/version.xml ${docdir_version_xml}
data/Makefile data/Makefile
tests/Makefile tests/Makefile
libpsl.pc:libpsl.pc.in]) libpsl.pc:libpsl.pc.in])