Changeset 732

Timestamp:

Dec 15, 2008, 10:52:00 PM (14 years ago)

Author:

Peter Johansson

Message:

• configure.ac: removed test that we are either in svn wc or DEV_BUILD is false

refs #362

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• man/Makefile.am (modified) (2 diffs)

trunk/configure.ac

@@ -70 +70 @@
 AC_PROG_RANLIB
 AC_PROG_SED
-AM_MISSING_PROG([HELP2MAN], [help2man])
+AC_PATH_PROG([HELP2MAN], [help2man], [no])
+AM_CONDITIONAL([HAVE_HELP2MAN], [test "$help2man" != "no"])
 AC_CHECK_PROG([GNUPLOT],[gnuplot],[ok])
 

trunk/man/Makefile.am

@@ -20 +20 @@
 # along with svndigest. If not, see <http://www.gnu.org/licenses/>.
 
-dist_man1_MANS = svndigest.1
+dist_man1_MANS = $(srcdir)/svndigest.1
 
 MAINTAINERCLEANFILES = $(dist_man1_MANS)
 
+if HAVE_HELP2MAN
 # we would like to depend on svndigest binary, but since svndigest.1
 # is distributed it is recommended to depend on only distributed files
 # (see automake manual 27.5).
-svndigest.1: $(top_srcdir)/configure $(srcdir)/Makefile.in
+$(srcdir)/svndigest.1: $(top_srcdir)/configure $(srcdir)/Makefile.in
   @$(HELP2MAN) --no-info -o $@ \
   --version-option="--no-verbose --version" \
   $(top_builddir)/bin/svndigest$(EXEEXT)
+else
+$(srcdir)/svndigest.1:
+  echo 'ab help2man is required to generate this page' > $@
+endif
 
 
@@ -38 +43 @@
 dist-hook:
   @if grep 'ab help2man is required to generate this page' \
-  svndigest.1 >/dev/null; then \
+  $(srcdir)/svndigest.1 >/dev/null; then \
           echo "error: svndigest.1 is bogus" >&2; \
           echo "       you need help2man to generate a valid man page" >&2;\