Get the "dev" suffix right.

[rsync.git] / prepare-source

diff --git a/prepare-source b/prepare-source
index a41a66a3e811f40000c1c0279be331566316a6e4..a4e78e61ea63bd5970d95028bba5b3dfc17b709b 100755 (executable)
--- a/prepare-source
+++ b/prepare-source
@@ -5,8 +5,8 @@
 # Specify one action or more than one to provide a fall-back:
 #
 #   build     build the config files [the default w/no arg]
-#   fetch     fetch the latest dev config files
-#   fetchgen  fetch all the latest dev generated files
+#   fetch     fetch the latest dev autoconfig files
+#   fetchgen  fetch all the latest dev generated files (including manpages)
 #   fetchSRC  fetch the latest dev source files [NON-GENERATED FILES]
 #
 # The script stops after the first successful action.
@@ -16,6 +16,26 @@ if test x"$dir" = x; then
     dir=.
 fi
 
+if test "$dir" = '.'; then
+    branch=`packaging/prep-auto-dir` || exit 1
+    if test x"$branch" != x; then
+       cd build || exit 1
+       dir=..
+    fi
+fi
+
+if test "$dir" != '.'; then
+    for lnk in configure.ac m4; do
+       if test ! -h $lnk; then
+           rm -f $lnk # Just in case
+           ln -s "$dir/$lnk" $lnk
+       fi
+    done
+    for fn in configure.sh config.h.in aclocal.m4; do
+       test ! -f $fn && test -f "$dir/$fn" && cp -p "$dir/$fn" $fn
+    done
+fi
+
 if test $# = 0; then
     set -- build
 fi
@@ -23,13 +43,16 @@ fi
 for action in "${@}"; do
     case "$action" in
     build|make)
-       (cd $dir && make -f prepare-source.mak)
+       make -f "$dir/prepare-source.mak"
        ;;
     fetch|fetchgen)
-       $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[ca]*' $dir
        if test "$action" = fetchgen; then
-           $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[^ca]*' .
+           match='*'
+       else
+           match='[ca]*'
        fi
+       $dir/rsync-ssl -iipc --no-motd "rsync://download.samba.org/rsyncftp/generated-files/$match" ./
+       test $? != 0 && continue
        sleep 1 # The following files need to be newer than aclocal.m4
        touch configure.sh config.h.in
        ;;
@@ -39,6 +62,7 @@ for action in "${@}"; do
     *)
        echo "Unknown action: $action"
        exit 1
+       ;;
     esac
     if test $? = 0; then
        exit