From: Wayne Davison Date: Thu, 28 Apr 2011 23:41:03 +0000 (-0700) Subject: Handle non-srcdir man copying when yodl isn't installed. X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/03080929146656daf4bdc164e4215bbadcbaa5e1 Handle non-srcdir man copying when yodl isn't installed. --- diff --git a/Makefile.in b/Makefile.in index dfb4e078..84b7ca43 100644 --- a/Makefile.in +++ b/Makefile.in @@ -181,9 +181,11 @@ proto.h: proto.h-tstamp proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c -man: rsync.1 rsyncd.conf.5 - @if test -f rsync.1; then :; else cp -p $(srcdir)/rsync.1 .; fi - @if test -f rsyncd.conf.5; then :; else cp -p $(srcdir)/rsyncd.conf.5 .; fi +man: rsync.1 rsyncd.conf.5 man-copy + +man-copy: + @if test -f rsync.1; then :; else echo 'Copying srcdir rsync.1'; cp -p $(srcdir)/rsync.1 .; fi + @if test -f rsyncd.conf.5; then :; else echo 'Copying srcdir rsyncd.conf.5'; cp -p $(srcdir)/rsyncd.conf.5 .; fi rsync.1: rsync.yo yodl2man -o rsync.1 $(srcdir)/rsync.yo diff --git a/configure.ac b/configure.ac index 73209bf0..302788cc 100644 --- a/configure.ac +++ b/configure.ac @@ -130,6 +130,8 @@ AC_DEFINE_UNQUOTED(RSYNC_RSH, "$RSYNC_RSH", [default -e command]) AC_CHECK_PROG(HAVE_YODL2MAN, yodl2man, 1, 0) if test x$HAVE_YODL2MAN = x1; then MAKE_MAN=man +else + MAKE_MAN=man-copy fi AC_ARG_WITH(nobody-group,