diff options
| author | Wayne Davison <wayne@opencoder.net> | 2020-04-22 10:53:38 -0700 |
|---|---|---|
| committer | Wayne Davison <wayne@opencoder.net> | 2020-04-22 12:40:14 -0700 |
| commit | 3249824264f90241a8acd0bbf7aa5ab3c88442ff (patch) | |
| tree | b82caa96376e55a99002db97a9b1834414e90764 /Makefile.in | |
| parent | 1c465dc33a6ac7dd2c67cd7ee2a40b6ff18e4ae3 (diff) | |
| download | rsync-3249824264f90241a8acd0bbf7aa5ab3c88442ff.tar.gz | |
Some more rsync-ssl improvements:
- Make the rsync-ssl default behavior more user friendly.
- Install rsync-ssl & rsync-ssl-rsh in the regular install rules.
- Add a manpage for rsync-ssl (which is also installed).
- Get rid of the rsync-ssl-client package in our spec file.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index b5aa9862..6ce3c74c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,7 +29,7 @@ VERSION=@RSYNC_VERSION@ .SUFFIXES: .SUFFIXES: .c .o -GENFILES=configure.sh aclocal.m4 config.h.in proto.h proto.h-tstamp rsync.1 rsyncd.conf.5 +GENFILES=configure.sh aclocal.m4 config.h.in proto.h proto.h-tstamp rsync.1 rsync-ssl.1 rsyncd.conf.5 HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \ lib/pool_alloc.h LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \ @@ -68,16 +68,14 @@ all: Makefile rsync$(EXEEXT) rsync-ssl stunnel-rsyncd.conf @MAKE_MAN@ install: all -${MKDIR_P} ${DESTDIR}${bindir} ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir} + ${INSTALLCMD} -m 755 rsync-ssl ${DESTDIR}${bindir} + ${INSTALLCMD} -m 755 rsync-ssl-rsh ${DESTDIR}${bindir} -${MKDIR_P} ${DESTDIR}${mandir}/man1 -${MKDIR_P} ${DESTDIR}${mandir}/man5 if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi + if test -f rsync-ssl.1; then ${INSTALLMAN} -m 644 rsync-ssl.1 ${DESTDIR}${mandir}/man1; fi if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi -install-ssl-client: rsync-ssl - -${MKDIR_P} ${DESTDIR}${bindir} - ${INSTALLCMD} -m 755 rsync-ssl ${DESTDIR}${bindir} - ${INSTALLCMD} -m 755 rsync-ssl-rsh ${DESTDIR}${bindir} - install-ssl-daemon: stunnel-rsyncd.conf -${MKDIR_P} ${DESTDIR}/etc/stunnel ${INSTALLCMD} -m 644 stunnel-rsyncd.conf ${DESTDIR}/etc/stunnel/rsyncd.conf @@ -209,16 +207,28 @@ proto.h: proto.h-tstamp proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h awk -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c -man: rsync.1 rsyncd.conf.5 man-copy +man: rsync.1 rsync-ssl.1 rsyncd.conf.5 man-copy man-copy: - @if test -f rsync.1; then :; elif test -f $(srcdir)/rsync.1; then echo 'Copying srcdir rsync.1'; cp -p $(srcdir)/rsync.1 .; else echo "NOTE: rsync.1 cannot be created."; fi - @if test -f rsyncd.conf.5; then :; elif test -f $(srcdir)/rsyncd.conf.5; then echo 'Copying srcdir rsyncd.conf.5'; cp -p $(srcdir)/rsyncd.conf.5 .; else echo "NOTE: rsyncd.conf.5 cannot be created."; fi + @for fn in rsync.1 rsync-ssl.1 rsyncd.conf.5; do \ + if test -f $$fn; then \ + : ; \ + elif test -f $(srcdir)/$$fn; then \ + echo "Copying srcdir $$fn" ; \ + cp -p $(srcdir)/$$fn . ; \ + else \ + echo "NOTE: $$fn cannot be created." ; \ + fi ; \ + done rsync.1: rsync.yo yodl2man -o rsync.1 $(srcdir)/rsync.yo -$(srcdir)/tweak_manpage rsync.1 +rsync-ssl.1: rsync-ssl.yo + yodl2man -o rsync-ssl.1 $(srcdir)/rsync-ssl.yo + -$(srcdir)/tweak_manpage rsync-ssl.1 + rsyncd.conf.5: rsyncd.conf.yo yodl2man -o rsyncd.conf.5 $(srcdir)/rsyncd.conf.yo -$(srcdir)/tweak_manpage rsyncd.conf.5 |