Re: master 7b1026c: * make-dist: Don't fail if building --without-makeinfo.

[Noam Postavsky <npostavs@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 505 bytes --]

On 5 May 2018 at 13:33, Paul Eggert <eggert@cs.ucla.edu> wrote:
> Eli Zaretskii wrote:
>>
>> Yes.  I think it makes more sense to try and then go ahead if
>> production of Info files fails.  It's not a strong opinion, though.
>
>
> Although that would be OK ordinarily, a user who runs './make-dist
> --no-info' does not want info files in the tarball and my point was that
> make-dist should not try to build them in that case.

Yes, I think I'd rather not see noise from error messages about it either.

[-- Attachment #2: v2-0001-make-dist-Add-no-info-option.patch --]
[-- Type: text/x-diff, Size: 2357 bytes --]

From c3f45f79ca28d873d2755eeb20fc58e3cbce71bd Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
Date: Fri, 4 May 2018 22:13:18 -0400
Subject: [PATCH v2] * make-dist: Add '--no-info' option.

---
 make-dist | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/make-dist b/make-dist
index aba5c43c52..bafcae35f0 100755
--- a/make-dist
+++ b/make-dist
@@ -51,6 +51,7 @@ clean_up=
 make_tar=no
 default_gzip=gzip
 newer=""
+with_info=yes
 with_tests=no
 changelog=yes
 verbose=no
@@ -77,6 +78,11 @@ verbose=
     "--no-changelog" )
       changelog=no
     ;;
+    ## This options tells make-dist to skip the info files.  This can
+    ## be useful for creating a tarball purely for test purposes.
+    "--no-info" )
+      with_info=no
+      ;;
     ## This option tells make-dist to make the distribution normally, then
     ## remove all files older than the given timestamp file.  This is useful
     ## for creating incremental or patch distributions.
@@ -124,6 +130,7 @@ verbose=
       echo "  --no-check	don't check for bad file names etc."
       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 "  --snapshot	same as --clean-up --no-update --tar --no-check"
       echo "  --tar		make a tar file"
       echo "  --tests	include the test/ directory"
@@ -292,7 +299,7 @@ tempparent=
 
   ## This exits with non-zero status if any .info files need
   ## rebuilding.
-  if [ -r Makefile ]; then
+  if [ -r Makefile ] && [ "$with_info" = "yes" ]; then
       echo "Checking to see if info files are up-to-date..."
       make --question info || error=yes
   fi
@@ -331,8 +338,10 @@ tempparent=
   rm -f src/stamp-h.in
   echo timestamp > src/stamp-h.in
 
-  echo "Updating Info files"
-  make info
+  if [ "$make_info" = yes ] ; then
+    echo "Updating Info files"
+    make info
+  fi
 
   echo "Updating finder, custom and autoload data"
   (cd lisp && make updates EMACS="$EMACS")
@@ -596,7 +605,7 @@ files=
   ln $f $tempdir/$f || exit
 done
 
-if [ -d info ]; then # Skip in case we've built --without-makeinfo.
+if [ "$with_info" = "yes" ]; then
   echo "Making links to 'info'"
   ln `find info -type f -print` ${tempdir}/info || exit
 fi
-- 
2.11.0