Changeset 1529


Ignore:
Timestamp:
Oct 2, 2012, 1:27:56 PM (9 years ago)
Author:
Peter Johansson
Message:

avoid make forks in rule for man pages

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r1525 r1529  
    321321YAT_SVN_RELEASE_YEAR
    322322
     323# Set variable if we are bulding from a typical distribution, i.e., we
     324# don't have svn wc and we have man pages (included in dist).
     325AM_CONDITIONAL([MAN_TARBALL],
     326  [test $have_svn_wc = "no" && test -r $srcdir/man/svndigest.1 && \
     327   test -r $srcdir/man/svncopyright.1 && \
     328   test -r $srcdir/man/svndiest-copy-cache.1])
    323329
    324330# Restore FLAGS
  • trunk/man/Makefile.am

    r1525 r1529  
    3838  $(srcdir)/man/svndigest.x $(top_srcdir)/.revision
    3939
    40 ## FIXME can we achieve similar behaviour without make invocations
     40svndigest_man_deps = $(man_deps)
     41svncopyright_man_deps = $(man_deps)
     42svndigest_copy_cache_man_deps = $(man_deps)
    4143
    42 $(srcdir)/man/svndigest.1: $(man_deps)
    43   @$(MAKE) $(AM_MAKE_FLAGS) bin/svndigest$(EXEEXT)
     44## we add dependencies to corresponding binaries in case when we
     45## already have man files (at configure time) and/or are building from
     46## a subversion WC. See comment above why we don't add this
     47## dependencies all the time
     48if MAN_TARBALL
     49else
     50svndigest_man_deps += bin/svndigest$(EXEEXT)
     51svncopyright_man_deps += bin/svncopyright$(EXEEXT)
     52svndigest_copy_cache_man_deps += bin/svndigest-copy-cache$(EXEEXT)
     53endif
     54
     55$(srcdir)/man/svndigest.1: $(svndigest_man_deps)
    4456  $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
    4557  --include $(srcdir)/man/svndigest.x \
     
    4759  $(top_builddir)/bin/svndigest$(EXEEXT)
    4860
    49 $(srcdir)/man/svncopyright.1: $(man_deps)
    50   @$(MAKE) $(AM_MAKE_FLAGS) bin/svncopyright$(EXEEXT)
     61$(srcdir)/man/svncopyright.1: $(svncopyright_man_deps)
    5162  $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
    5263  --include $(srcdir)/man/svndigest.x \
     
    5465  $(top_builddir)/bin/svncopyright$(EXEEXT)
    5566
    56 $(srcdir)/man/svndigest-copy-cache.1: $(man_deps)
    57   @$(MAKE) $(AM_MAKE_FLAGS) bin/svndigest-copy-cache$(EXEEXT)
     67$(srcdir)/man/svndigest-copy-cache.1: $(svndigest_copy_cache_man_deps)
    5868  $(AM_V_at)$(HELP2MAN) --no-info -o $@ \
    5969  --include $(srcdir)/man/svndigest.x \
Note: See TracChangeset for help on using the changeset viewer.