From 08c8375acb2a6a34b5abbadaaed1e7cd9dbbb0d8 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 18 Jan 2022 23:01:48 -0800 Subject: [PATCH] Tweak rrsync rules in the Makefile. --- Makefile.in | 2 +- configure.ac | 2 ++ packaging/pkglib.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1b4ea783..8817edab 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,7 +35,7 @@ ASM_x86_64=lib/md5-asm-x86_64.o GENFILES=configure.sh aclocal.m4 config.h.in rsync.1 rsync.1.html \ rsync-ssl.1 rsync-ssl.1.html rsyncd.conf.5 rsyncd.conf.5.html \ - rrsync.1 rrsync.1.html + @GEN_RRSYNC@ HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \ lib/pool_alloc.h lib/mdigest.h lib/md-defines.h LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \ diff --git a/configure.ac b/configure.ac index 1e1bcc78..7031283a 100644 --- a/configure.ac +++ b/configure.ac @@ -142,6 +142,7 @@ if test x"$with_rrsync" != x"yes"; then else MAKE_RRSYNC='rrsync' MAKE_RRSYNC_1='rrsync.1' + GEN_RRSYNC='rrsync.1 rrsync.1.html' fi AC_SUBST(with_rrsync) @@ -1257,6 +1258,7 @@ AC_SUBST(BUILD_POPT) AC_SUBST(BUILD_ZLIB) AC_SUBST(MAKE_RRSYNC) AC_SUBST(MAKE_RRSYNC_1) +AC_SUBST(GEN_RRSYNC) AC_SUBST(MAKE_MAN) AC_CHECK_FUNCS(_acl __acl _facl __facl) diff --git a/packaging/pkglib.py b/packaging/pkglib.py index 57cc2012..52f3d892 100644 --- a/packaging/pkglib.py +++ b/packaging/pkglib.py @@ -181,7 +181,7 @@ def mandate_gensend_hook(): die('Please add a "make gensend" into your', hook, 'script.') -# Snag the GENFILES values out of the Makefile.in file and return them as a list. +# Snag the GENFILES values out of the Makefile file and return them as a list. def get_gen_files(want_dir_plus_list=False): cont_re = re.compile(r'\\\n') @@ -189,7 +189,7 @@ def get_gen_files(want_dir_plus_list=False): auto_dir = os.path.join('auto-build-save', cmd_txt('git rev-parse --abbrev-ref HEAD').out.strip().replace('/', '%')) - with open('Makefile.in', 'r', encoding='utf-8') as fh: + with open(auto_dir + '/Makefile', 'r', encoding='utf-8') as fh: for line in fh: if not gen_files: chk = re.sub(r'^GENFILES=', '', line) -- 2.47.2