The branch, master has been updated
via 0308092 Handle non-srcdir man copying when yodl isn't installed.
from a13d3b3 Avoid adding a slash to path '/'.
;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 03080929146656daf4bdc164e4215bbadcbaa5e1
Author: Wayne Davison <way...@samba.org>
Date: Thu Apr 28 16:41:03 2011 -0700
Handle non-srcdir man copying when yodl isn't installed.
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 8 +++++---
configure.ac | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index dfb4e07..84b7ca4 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 73209bf..302788c 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,
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
