From c5d502dc5f463828d0cb4e28e1a72332124aebd1 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 20 Jun 2020 18:46:16 -0700 Subject: [PATCH] When fetching gen files, make sure aclocal.m4 is older than configure files. --- prepare-source | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/prepare-source b/prepare-source index 3e4f9edf..14ec1b69 100755 --- a/prepare-source +++ b/prepare-source @@ -25,15 +25,17 @@ for action in "${@}"; do build|make) (cd $dir && make -f prepare-source.mak) ;; - fetch) + fetch|fetchgen) $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[ca]*' $dir - if ! perl --version >/dev/null 2>/dev/null; then + if test "$action" = fetchgen; then + $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[^ca]*' . + elif ! perl --version >/dev/null 2>/dev/null; then $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'p*' . fi + sleep 1 # The following files need to be newer than aclocal.m4 + touch configure.sh config.h.in ;; fetchgen) - $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[ca]*' $dir - $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[^ca]*' . ;; fetchSRC) ./rsync-ssl -iipr --no-motd --exclude=/.git/ rsync://download.samba.org/ftp/pub/unpacked/rsync/ . -- 2.47.2