diff options
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/make-dist b/make-dist index 606fdd9e3a0..7074bb801be 100755 --- a/make-dist +++ b/make-dist @@ -52,7 +52,6 @@ make_tar=no default_gzip=gzip newer="" with_info=yes -with_tests=yes changelog=yes verbose=no @@ -109,16 +108,10 @@ while [ $# -gt 0 ]; do update=no ;; - ## Include the test/ directory. - ## This is for backward compatibility to when --no-tests was the default. - "--tests") - with_tests=yes + "--tests"|"--no-tests") + echo "The option $1 no longer does anything" ;; - ## Exclude the test/ directory. - "--no-tests") - with_tests=no - ;; "--verbose") verbose=yes @@ -136,7 +129,6 @@ while [ $# -gt 0 ]; do echo " --no-update don't recompile or do analogous things" echo " --no-changelog don't generate the top-level ChangeLog" echo " --no-info don't include info files" - echo " --no-tests don't include the test/ directory" echo " --snapshot same as --clean-up --no-update --tar" echo " --tar make a tar file" echo " --verbose noisier output" @@ -402,11 +394,7 @@ manifest=MANIFEST # if .git is present. if ( [ $update = yes ] || [ ! -f $manifest ] ) && [ -r .git ]; then echo "Updating $manifest" - if [ $with_tests = yes ]; then - git ls-files > $manifest - else - git ls-files | grep -v '^test' >$manifest - fi || exit + git ls-files > $manifest || exit printf '%s\n' $possibly_non_vc_files $info_files >>$manifest || exit sort -u -o $manifest $manifest || exit fi |