mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-05-24 14:55:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebuilding configure.sh in an alternate build dir

Browse Source
This commit is contained in:
Wayne Davison
2020-06-28 11:18:55 -07:00
parent 8df766917e
commit 76064b1bf2
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.in
View File

@@ -172,17 +172,16 @@ aclocal.m4: $(srcdir)/m4/*.m4
aclocal -I $(srcdir)/m4
configure.sh config.h.in: configure.ac aclocal.m4
@if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
@if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
autoconf -o configure.sh
autoheader && touch config.h.in
@if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
@test -f "$(srcdir)/configure.sh" && cp -p "$(srcdir)/configure.sh" configure.sh.old || touch configure.sh.old
@test -f "$(srcdir)/config.h.in" && cp -p "$(srcdir)/config.h.in" config.h.in.old || touch config.h.in.old
(cd "$(srcdir)" && autoconf -o configure.sh && autoheader && touch config.h.in)
@if diff "$(srcdir)/configure.sh" configure.sh.old >/dev/null 2>&1; then \
echo "configure.sh is unchanged."; \
rm configure.sh.old; \
else \
echo "configure.sh has CHANGED."; \
fi
@if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
@if diff "$(srcdir)/config.h.in" config.h.in.old >/dev/null 2>&1; then \
echo "config.h.in is unchanged."; \
rm config.h.in.old; \
else \
@@ -203,6 +202,10 @@ reconfigure: configure.sh
./config.status --recheck
./config.status
.PHONY: restatus
restatus:
./config.status
Makefile: Makefile.in config.status configure.sh config.h.in
@if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
@./config.status

2
NEWS.md
View File

@@ -10,6 +10,8 @@ Protocol: 31 (unchanged)
- Fixed installing rsync-ssl script from an alternate build dir.
- Fixed the updating of configure.sh from an alternate build dir.
- Apple requires the asm function name to begin with an underscore.
- Avoid a test failure in the daemon test when --atimes is disabled.

6
packaging/patch-update
View File

@@ -31,9 +31,11 @@ def main():
starting_branch, args.base_branch = check_git_state(args.base_branch, not args.skip_check, args.patches_dir)
if not os.path.isdir('.gen-stash'):
os.mkdir('.gen-stash', 0o700)
gen_stash(starting_branch)
if starting_branch == 'master':
cmd_run('md5sum configure.ac >.gen-stash/configure.ac.sum')
cmd_chk('md5sum configure.ac >.gen-stash/configure.ac.sum')
master_commit = latest_git_hash(args.base_branch)
@@ -213,8 +215,6 @@ def gen_stash(branch):
for fn in files:
if not os.path.exists(fn):
return
if not os.path.isdir('.gen-stash'):
os.mkdir('.gen-stash', 0o700)
tar_fn = gen_stash_prep(branch)
cmd_run(['./prepare-source'])
cmd_chk(['tar', 'czf', tar_fn, *files])