diff options
| author | Martijn van Beurden <mvanb1@gmail.com> | 2022-09-18 10:11:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-18 10:11:47 +0200 |
| commit | 71c3c55dba5ce201c365558ede00caf99d145ea8 (patch) | |
| tree | 84e320b1e8207417b3786673067259b0cf3071a1 | |
| parent | 1c0eea679ae4351c77c912988d0a24d90809965a (diff) | |
| download | flac-71c3c55dba5ce201c365558ede00caf99d145ea8.tar.gz | |
Do not make empty man pages, use either pandoc or prebuild (#440)
* Do not make empty man pages, use either pandoc or prebuild
A check is added to configure whether flac.1 and metaflac.1
are already build when pandoc is not available. This is the
case in for example dist packages
* Fix typo in new automake conditional
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | man/Makefile.am | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 5fa8d9db..d0f29e05 100644 --- a/configure.ac +++ b/configure.ac @@ -476,7 +476,11 @@ AM_CONDITIONAL(FLaC__HAS_PANDOC, test -n "$PANDOC") if test -n "$PANDOC" ; then AC_DEFINE(FLAC__HAS_PANDOC) AH_TEMPLATE(FLAC__HAS_PANDOC, [define if you have pandoc]) +else +AC_CHECK_FILE($srcdir/man/flac.1,[HAVE_MAN_FLAC=yes]) +AC_CHECK_FILE($srcdir/man/metaflac.1,[HAVE_MAN_METAFLAC=yes]) fi +AM_CONDITIONAL(FLaC__HAS_PREBUILT_MANPAGES, test "x$HAVE_MAN_FLAC$HAVE_MAN_METAFLAC" = "xyesyes") AC_CHECK_LIB(rt, clock_gettime, LIB_CLOCK_GETTIME=-lrt diff --git a/man/Makefile.am b/man/Makefile.am index 8ffd98d1..2e8afe3f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -22,16 +22,13 @@ flac.1: flac.md metaflac.1: metaflac.md pandoc --standalone --to man $? > $@ - -else -flac.1: - echo "*** Warning: docbook-to-man not found; man pages will not be built." - touch $@ -metaflac.1: - touch $@ -endif +man_MANS = flac.1 metaflac.1 +else +if FLaC__HAS_PREBUILT_MANPAGES man_MANS = flac.1 metaflac.1 +endif +endif -EXTRA_DIST = $(man_MANS) flac.md metaflac.md +EXTRA_DIST = flac.1 metaflac.1 flac.md metaflac.md |