diff options
| author | Trent Lloyd <lathiat@bur.st> | 2005-10-19 21:55:41 +0000 |
|---|---|---|
| committer | Trent Lloyd <lathiat@bur.st> | 2005-10-19 21:55:41 +0000 |
| commit | a26b065238debb81e25106b573addb323e529bce (patch) | |
| tree | 593087f819650bddf69eaad1dac77bb3d3dfa278 | |
| parent | 7b0eb2d40a258c84cc2cd77bbca2e91c83b49331 (diff) | |
* Move some of the man page checks around to catch more situations
* Fix the man dir harder
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@828 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | man/Makefile.am | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index bf8f316..17f2f94 100644 --- a/configure.ac +++ b/configure.ac @@ -584,15 +584,15 @@ if test x$manpages = xyes ; then if test x$xmltoman = xyes ; then AC_CHECK_PROG(have_xmltoman, xmltoman, yes, no) - - if test x$have_xmltoman = xno ; then - if ! test -e man/avahi-daemon.8 ; then - AC_MSG_ERROR([*** xmltoman was not found, it is required to build the manpages and they have not been pre-built]) - exit 1 - fi - AC_MSG_WARN([*** Not rebuilding man pages as xmltoman is not found ***]) - xmltoman=no + fi + + if test x$have_xmltoman = xno -o x$xmltoman = xno; then + if ! test -e man/avahi-daemon.8 ; then + AC_MSG_ERROR([*** xmltoman was not found or was disabled, it is required to build the manpages as they have not been pre-built, install xmltoman, pass --disable-manpages or dont pass --disable-xmltoman]) + exit 1 fi + AC_MSG_WARN([*** Not rebuilding man pages as xmltoman is not found ***]) + xmltoman=no fi fi AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes]) diff --git a/man/Makefile.am b/man/Makefile.am index c2bd848..d80c885 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -20,6 +20,15 @@ pkgsysconfdir=$(sysconfdir)/avahi servicedir=$(pkgsysconfdir)/services +if BUILD_MANPAGES + +man_MANS = \ + avahi-daemon.8 \ + avahi-dnsconfd.8 \ + avahi-daemon.conf.5 \ + avahi-dnsconfd.action.8 \ + avahi.service.5 + noinst_DATA = \ avahi-browse.1.xml \ avahi-publish-service.1.xml \ @@ -37,15 +46,6 @@ noinst_DATA = \ CLEANFILES = \ $(noinst_DATA) -if BUILD_MANPAGES - -man_MANS = \ - avahi-daemon.8 \ - avahi-dnsconfd.8 \ - avahi-daemon.conf.5 \ - avahi-dnsconfd.action.8 \ - avahi.service.5 - if HAVE_PYTHON if HAVE_DBUS |