Ignore:
Timestamp:
Jun 13, 2010, 7:28:19 PM (11 years ago)
Author:
Peter Johansson
Message:

merge trunk to src-highlight

Location:
branches/src-highlight
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/src-highlight

  • branches/src-highlight/man/Makefile.am

    r805 r1100  
    33## $Id$
    44
    5 # Copyright (C) 2008 Peter Johansson
     5# Copyright (C) 2008, 2009, 2010 Peter Johansson
    66#
    7 # This file is part of svndigest, http://trac.thep.lu.se/trac/svndigest
     7# This file is part of svndigest, http://dev.thep.lu.se/trac/svndigest
    88#
    99# svndigest is free software; you can redistribute it and/or modify it
     
    2020# along with svndigest. If not, see <http://www.gnu.org/licenses/>.
    2121
    22 dist_man1_MANS = $(srcdir)/svndigest.1
     22dist_man1_MANS =
     23dist_man1_MANS += $(srcdir)/svncopyright.1
     24dist_man1_MANS += $(srcdir)/svndigest.1
     25dist_man1_MANS += $(srcdir)/svndigest-copy-cache.1
    2326
    2427EXTRA_DIST = svndigest.x
     
    2629MAINTAINERCLEANFILES = $(dist_man1_MANS)
    2730
    28 if HAVE_HELP2MAN
    2931# we would like to depend on svndigest binary, but since svndigest.1
    3032# is distributed it is recommended to depend on only distributed files
    3133# (see automake manual 27.5).
    3234$(srcdir)/svndigest.1: $(top_srcdir)/configure $(srcdir)/Makefile.in \
    33   $(srcdir)/svndigest.x
     35  $(srcdir)/svndigest.x $(top_srcdir)/bin/svndigestParameter.cc
    3436  @$(HELP2MAN) --no-info -o $@ \
    3537  --include $(srcdir)/svndigest.x \
    3638  --version-option="--no-verbose --version" \
    3739  $(top_builddir)/bin/svndigest$(EXEEXT)
    38 else
    39 $(srcdir)/svndigest.1:
    40   echo "WARNING: bogus svndigest.1 is created" >&2; \
    41   echo 'ab help2man is required to generate this page' > $@
    4240
    43 # Checking that we don't ship a bogus man page, which might be created
    44 # if help2man is not available. (The check can be removed in a future
    45 # where we require Automake 1.11)
    46 dist-hook:
    47         echo "ERROR: svndigest.1 is bogus" >&2; \
    48         echo "       you need help2man to generate a valid man page" >&2;\
    49         echo "       install help2man, re-run `configure'," >&2;\
    50         echo "       remove svndigest.1 and run 'make'" >&2;\
    51         exit 1;
    52 endif
     41$(srcdir)/svncopyright.1: $(top_srcdir)/configure $(srcdir)/Makefile.in \
     42  $(srcdir)/svndigest.x $(top_srcdir)/bin/svncopyrightParameter.cc
     43  @$(HELP2MAN) --no-info -o $@ \
     44  --include $(srcdir)/svndigest.x \
     45  --version-option="--no-verbose --version" \
     46  $(top_builddir)/bin/svncopyright$(EXEEXT)
     47
     48$(srcdir)/svndigest-copy-cache.1: $(top_srcdir)/configure $(srcdir)/Makefile.in \
     49  $(srcdir)/svndigest.x $(top_srcdir)/bin/svndigest-copy-cache.in
     50  @$(HELP2MAN) --no-info -o $@ \
     51  --include $(srcdir)/svndigest.x \
     52  $(top_builddir)/bin/svndigest-copy-cache
     53
Note: See TracChangeset for help on using the changeset viewer.