Fix problems with README and build.sh

Apply an old patch from Paul Eggert.

6 files changed, 66 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index 31b15f4..a30f989 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-30  Paul D. Smith  <psmith@gnu.org>
+
+	* configure.in: The old way we avoided creating build.sh from
+	build.sh.in before build.sh.in exists doesn't work anymore; we
+	have to use raw M4 (thanks to Andreas Schwab <schwab@suse.de> for
+	the help!).  This also keeps automake from complaining.
+	* Makefile.am (README): Add a dummy target so automake won't
+	complain that this file doesn't exist when we checkout from CVS.
+	* maintMakefile (.dep_segment): Rewrite this rule since newer
+	versions of automake don't provide DEP_FILES.
+
 2004-11-30  Boris Kolpackov  <boris@kolpackov.net>
 
 	Implementation of `realpath' and `abspath' built-in functions.
@@ -396,6 +407,11 @@
 	(get-config/config.guess get-config/config.sub): Get these files
 	from the Savannah config project instead of ftp.gnu.org.
 
+2003-10-05  Paul Eggert  <eggert@twinsun.com>
+
+	* main.c (main): Avoid potential subscript error if environ has
+	short strings.
+
 2003-08-22  Paul D. Smith  <psmith@gnu.org>
 
 	* misc.c (xmalloc, xrealloc): Add one to 0 sizes, to cater to
diff --git a/INSTALL b/INSTALL
index 54caf7c..095b1eb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,13 +1,16 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Installation Instructions
+*************************
 
-   This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-   These are generic installation instructions.
+These are generic installation instructions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -67,9 +70,9 @@ The simplest way to compile this package is:
 Compilers and Options
 =====================
 
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -82,7 +85,7 @@ is an example:
 Compiling For Multiple Architectures
 ====================================
 
-   You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
@@ -99,19 +102,19 @@ for another architecture.
 Installation Names
 ==================
 
-   By default, `make install' will install the package's files in
+By default, `make install' will install the package's files in
 `/usr/local/bin', `/usr/local/man', etc.  You can specify an
 installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
@@ -122,7 +125,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 
-   Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,11 +140,11 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -167,9 +170,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -178,7 +181,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-   Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -192,8 +195,7 @@ overridden in the site shell script).
 `configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
 
 `--help'
 `-h'
diff --git a/Makefile.am b/Makefile.am
index 96fb188..b3d85c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -157,4 +157,10 @@ check-regression:
 
 # --------------- Maintainer's Section
 
+# Tell automake that I haven't forgotten about this file and it will be
+# created before we build a distribution (see maintMakefile in the CVS
+# distribution).
+
+README:
+
 @MAINT_MAKEFILE@
diff --git a/configure.in b/configure.in
index 39a8b66..da37bc9 100644
--- a/configure.in
+++ b/configure.in
@@ -389,14 +389,12 @@ esac
 
 
 # Specify what files are to be created.
-# We only generate the build.sh if we have a build.sh.in; we won't have
-# one before we've created a distribution.
-
 AC_CONFIG_FILES(Makefile glob/Makefile po/Makefile.in config/Makefile doc/Makefile)
 
-if test -f $srcdir/build.sh.in; then
-  AC_CONFIG_FILES(build.sh)
-fi
+# We only generate the build.sh if we have a build.sh.in; we won't have
+# one before we've created a distribution.
+m4_syscmd([test -f build.sh.in])dnl
+m4_if(m4_sysval, 0, [AC_CONFIG_FILES(build.sh)])
 
 
 # OK, do it!
diff --git a/main.c b/main.c
index 700e4ba..763fd54 100644
--- a/main.c
+++ b/main.c
@@ -1919,8 +1919,8 @@ main (int argc, char **argv, char **envp)
 
 #ifndef _AMIGA
 	  for (p = environ; *p != 0; ++p)
-	    if ((*p)[MAKELEVEL_LENGTH] == '='
-		&& strneq (*p, MAKELEVEL_NAME, MAKELEVEL_LENGTH))
+	    if (strneq (*p, MAKELEVEL_NAME, MAKELEVEL_LENGTH)
+		&& (*p)[MAKELEVEL_LENGTH] == '=')
 	      {
 		/* The SGI compiler apparently can't understand
 		   the concept of storing the result of a function
diff --git a/maintMakefile b/maintMakefile
index c3208fe..b6cb0c9 100644
--- a/maintMakefile
+++ b/maintMakefile
@@ -15,11 +15,6 @@ MTEMPLATES = Makefile.DOS SMakefile
 
 all-am: $(TEMPLATES) $(MTEMPLATES) build.sh.in
 
-# We need this to ensure that README and build.sh.in are created on time to
-# avoid errors by automake.
-#
-#Makefile.in: README build.sh.in
-
 # General rule for turning a .template into a regular file.
 #
 $(TEMPLATES) : % : %.template Makefile
@@ -67,13 +62,18 @@ build.sh.in: build.template Makefile
 # Automake used to have a --generate-deps flag, but it's gone now, so we have
 # to do it ourselves.
 #
+DEP_FILES := $(wildcard $(DEPDIR)/*.Po)
 .dep_segment: Makefile.am maintMakefile $(DEP_FILES)
-	cat $(DEP_FILES) \
-	  | sed -e '/^[^:]*\.[ch] *:/d' \
-		-e 's, /usr/[^ ]*,,g' \
-		-e 's, $(srcdir)/, ,g' \
-		-e '/^ \\$$/d' \
-	  > $@
+	(for f in $(DEPDIR)/*.Po; do \
+	   echo ""; \
+	   echo "# $$f"; \
+	   cat $$f \
+	     | sed -e '/^[^:]*\.[ch] *:/d' \
+		   -e 's, /usr/[^ ]*,,g' \
+		   -e 's, $(srcdir)/, ,g' \
+		   -e '/^ *\\$$/d' \
+		   -e '/^ *$$/d'; \
+	 done) > $@
 
 # Get rid of everything "else".
 #