Changeset 1591 for branches/0.10-stable


Ignore:
Timestamp:
Aug 20, 2015, 4:43:11 PM (4 years ago)
Author:
Jari Häkkinen
Message:

Addresses #530. Allow build of svndigest but fail for 'make dist'.

Location:
branches/0.10-stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/0.10-stable/configure.ac

    r1588 r1591  
    362362all_reqs_ok="true"
    363363
     364AM_CONDITIONAL([HAVE_HELP2MAN],[false])
    364365AS_VAR_IF([have_svn_wc], [yes], [
    365366   AC_MSG_CHECKING([help2man])
    366367   # redirecting potential error msg to log file
    367368   AS_IF([help2man --version >/dev/null 2>&AS_MESSAGE_LOG_FD],
    368          [AC_MSG_RESULT([yes])],
     369         [AC_MSG_RESULT([yes])
     370          AM_CONDITIONAL([HAVE_HELP2MAN],[true])
     371   ],
    369372         [AC_MSG_RESULT([no])
    370      AC_MSG_WARN(m4_text_wrap(m4_normalize([
     373    AC_MSG_WARN(m4_text_wrap(m4_normalize([
    371374       `help2man' is missing on your system.  You will not be
    372375       able to create the man page. A sound man page should be
  • branches/0.10-stable/man/Makefile.am

    r1402 r1591  
    44
    55# Copyright (C) 2008, 2009, 2010, 2011 Peter Johansson
     6# Copyright (C) 2015 Jari Häkkinen
    67#
    78# This file is part of svndigest, http://dev.thep.lu.se/trac/svndigest
     
    3940
    4041$(srcdir)/svndigest.1: $(man_deps)
     42if HAVE_HELP2MAN
    4143  @$(HELP2MAN) --no-info -o $@ \
    4244  --include $(srcdir)/svndigest.x \
    4345  --version-option="--no-verbose --version" \
    4446  $(top_builddir)/bin/svndigest$(EXEEXT)
     47else
     48  @rm -f $@     # Remove stray man page to force 'make dist' to fail
     49  @echo help2man not found, no $@ man page created
     50  @echo make dist and make distcheck will fail
     51endif
    4552
    4653$(srcdir)/svncopyright.1: $(man_deps)
     54if HAVE_HELP2MAN
    4755  @$(HELP2MAN) --no-info -o $@ \
    4856  --include $(srcdir)/svndigest.x \
    4957  --version-option="--no-verbose --version" \
    5058  $(top_builddir)/bin/svncopyright$(EXEEXT)
     59else
     60  @rm -f $@     # Remove stray man page to force 'make dist' to fail
     61  @echo help2man not found, no $@ man page created
     62  @echo make dist and make distcheck will fail
     63endif
    5164
    5265$(srcdir)/svndigest-copy-cache.1: $(man_deps)
     66if HAVE_HELP2MAN
    5367  @$(HELP2MAN) --no-info -o $@ \
    5468  --include $(srcdir)/svndigest.x \
    5569  --version-option="--no-verbose --version" \
    5670  $(top_builddir)/bin/svndigest-copy-cache$(EXEEXT)
    57 
     71else
     72  @rm -f $@     # Remove stray man page to force 'make dist' to fail
     73  @echo help2man not found, no $@ man page created
     74  @echo make dist and make distcheck will fail
     75endif
Note: See TracChangeset for help on using the changeset viewer.