diff --git a/Makefile.am b/Makefile.am index 65ced9de..0d3ec66f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ -SUBDIRS = man ARFLAGS = cr +man_MANS = $(top_srcdir)/man/shairport-sync.7 + lib_pair_ap_a_CFLAGS = -Wall -g -DCONFIG_GCRYPT -pthread lib_tinyhttp_a_CFLAGS = -pthread lib_dbus_interface_a_CFLAGS = -pthread diff --git a/configure.ac b/configure.ac index 16d10eb9..b65aad38 100644 --- a/configure.ac +++ b/configure.ac @@ -444,20 +444,6 @@ if test "x${with_systemd}" = xyes ; then [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) fi -# Look for xmltoman -AC_CHECK_PROGS([XMLTOMAN], [xmltoman]) -if test -z "$XMLTOMAN"; then - AC_MSG_WARN([xmltoman not found - not installing man page]) -fi -AM_CONDITIONAL([HAVE_XMLTOMAN], [test -n "$XMLTOMAN"]) - -# Look for xmltoman -AC_CHECK_PROGS([XSLTPROC], [xsltproc]) -if test -z "$XSLTPROC"; then - AC_MSG_WARN([xsltproc not found - not creating html version of man]) -fi -AM_CONDITIONAL([HAVE_XSLTPROC], [test -n "$XSLTPROC"]) - # Checks for header files. AC_CHECK_HEADERS([getopt_long.h]) AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h mach/mach.h memory.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h syslog.h unistd.h]) @@ -482,6 +468,6 @@ AC_FUNC_FORK AC_CHECK_FUNCS([atexit clock_gettime gethostname inet_ntoa memchr memmove memset mkfifo pow select socket stpcpy strcasecmp strchr strdup strerror strstr strtol strtoul]) # Note -- there are AC_CONFIG_FILES directives further back, conditional on Avahi -AC_CONFIG_FILES([Makefile man/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([scripts/shairport-sync],[chmod +x scripts/shairport-sync]) AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index c7d4dfba..00000000 --- a/man/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -man_MANS = shairport-sync.7 - -if HAVE_XMLTOMAN -shairport-sync.7: shairport-sync.7.xml - xmltoman $< > $@ -endif - -if HAVE_XSLTPROC -all-local: shairport-sync.html - -shairport-sync.html: xmltoman.xsl shairport-sync.7.xml - xsltproc $^ > $@ -endif