Check for mktemp.

(main) [! HAVE_MKTEMP]: Use tmpnam instead of mktemp.
(make_cv_sysconf_open_max): New check for `sysconf (_SC_OPEN_MAX)'.
2026-08-20 08:53:28 +08:00 · 1995-02-05 23:50:12 +00:00 · 1995-02-05 23:49:40 +00:00 · 1995-02-05 23:45:49 +00:00 · 1995-02-05 23:36:04 +00:00 · 1995-02-05 23:35:39 +00:00
25 changed files with 869 additions and 490 deletions
--- a/17
+++ b/17
@@ -45,6 +45,8 @@ include compatMakefile
 MAKE = $(MAKE_COMMAND) $(MAKEOVERRIDES)

 # Remove autoconf magic.
+prefix = /usr/local
+exec_prefix = $(prefix)
 extras := $(filter-out getloadavg.o @%@,$(extras)) getloadavg.o
 LOADLIBES := $(filter-out @%@,$(LOADLIBES))
 ALLOCA := $(filter-out @%@,$(ALLOCA))
@@ -86,7 +88,7 @@ GLOB =

 else

-CPPFLAGS := $(CPPFLAGS) -Iglob
+CPPFLAGS := $(filter-out @%@,$(CPPFLAGS)) -Iglob

 endif	 # works-for-make
 endif	 # $(libc_dir)
@@ -96,9 +98,7 @@ endif	 # !no_libc
 $(ARCH)/%.o: %.c
 	$(COMPILE.c) -Iglob $< $(OUTPUT_OPTION)
 $(ARCH)/glob/libglob.a: FORCE
-	$(MAKE) -C $(@D) $(@F) \
-		CC='$(CC)' CFLAGS='$(CFLAGS) -I..' \
-		CPPFLAGS='$(CPPFLAGS) -DHAVE_CONFIG_H'
+	$(MAKE) -C $(@D) $(@F)
 FORCE:
 objs := $(addprefix $(ARCH)/,$(objs))
 prog := $(ARCH)/make
@@ -147,7 +147,7 @@ $(prog): $(objs) $(globdep) #$(addprefix $(ARCH)/,gmalloc.o mcheck.o)
 	$(CC) $(LDFLAGS) $^ $(globlib) $(LOADLIBES) -o $@.new
 	mv -f $@.new $@

-globfiles = $(addprefix glob/,COPYING.LIB Makefile.in \
+globfiles = $(addprefix glob/,COPYING.LIB configure.in configure Makefile.in \
 			glob.c fnmatch.c glob.h fnmatch.h)
 $(globfiles): stamp-glob ;
 stamp-glob: /home/gd/gnu/libc/posix/glob.tar
@@ -197,6 +197,7 @@ build.sh.in: build.template compatMakefile
 	       $(patsubst $(archpfx)%,%,$(objs)))\
 	       $(patsubst %.c,%.o,$(filter %.c,$(globfiles)))@' \
 	    $< > $@.new
+	chmod a+x $@.new
 	mv -f $@.new $@

 # Make the distribution tar files.
@@ -218,8 +219,8 @@ dist-flavor = alpha
 endif
 .PHONY: rcs-mark rcs-mark-alpha rcs-mark-beta
 rcs-mark: rcs-mark-$(dist-flavor)
-rcs-mark-alpha:;rcs -sAlpha -Nmake-$(version-): RCS/[!=]*,v
-rcs-mark-beta:;rcs -sBeta -Nmake-$(version-): RCS/[!=]*,v
+rcs-mark-alpha: RCS/[!=]*,v;rcs -sAlpha -Nmake-$(version-): $^
+rcs-mark-beta: RCS/[!=]*,v;rcs -sBeta -Nmake-$(version-): $^
 version- = $(subst .,-,$(version))

 dist: local-inst
@@ -262,7 +263,7 @@ make-$(version).tar: README INSTALL COPYING ChangeLog NEWS \
 	  acconfig.h $(srcs) remote-*.c $(globfiles) \
 	  make.texinfo make-stds.texi \
 	  make.?? make.??s make.toc make.aux make.man texinfo.tex TAGS tags \
-	  install.sh \
+	  install-sh \
 	  make.info make.info*
 	$(make-tar)

--- a/acconfig.h
+++ b/acconfig.h
@@ -9,3 +9,9 @@

 /* Define this if the C library defines the variable `_sys_siglist'.  */
 #undef HAVE__SYS_SIGLIST
+
+/* Define this if you have the `union wait' type in <sys/wait.h>.  */
+#undef HAVE_UNION_WAIT
+
+/* Define this if the POSIX.1 call `sysconf (_SC_OPEN_MAX)' works properly.  */
+#undef HAVE_SYSCONF_OPEN_MAX
--- a/alloca.c
+++ b/alloca.c
@@ -22,11 +22,7 @@
   your main control loop, etc. to force garbage collection.  */

 #ifdef HAVE_CONFIG_H
-#if defined (emacs) || defined (CONFIG_BROKETS)
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif

 #ifdef emacs
--- a/arscan.c
+++ b/arscan.c
@@ -429,11 +429,11 @@ ar_name_equal (name, mem, truncated)
      struct ar_hdr hdr;
      return !strncmp (name, mem,
 		       sizeof (hdr.ar_name) - 
-#ifndef __hpux
+#if !defined (__hpux) && !defined (cray)
 		       1
 #else
 		       2
-#endif /* __hpux */
+#endif /* !__hpux && !cray */
 		       );
 #endif
    }
--- a/build.sh.in
+++ b/build.sh.in
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# Shell script to build GNU Make in the absence of any `make' program.
+
+# Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+# This file is part of GNU Make.
+# 
+# GNU Make is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Make is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Make; see the file COPYING.  If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# See Makefile.in for comments describing these variables.
+
+srcdir='@srcdir@'
+CC='@CC@'
+CFLAGS='@CFLAGS@'
+CPPFLAGS='@CPPFLAGS@'
+LDFLAGS='@LDFLAGS@'
+defines='@DEFS@ -DLIBDIR="${libdir}" -DINCLUDEDIR="${includedir}"'
+ALLOCA='@ALLOCA@'
+LOADLIBES='@LIBS@'
+extras='@LIBOBJS@'
+REMOTE='@REMOTE@'
+
+# Common prefix for machine-independent installed files.
+prefix=@prefix@
+# Common prefix for machine-dependent installed files.
+exec_prefix=@exec_prefix@
+# Directory to find libraries in for `-lLIB'.
+libdir=${exec_prefix}/lib
+# Directory to search by default for included makefiles.
+includedir=${prefix}/include
+
+# Exit as soon as any command fails.
+set -e
+
+# These are all the objects we need to link together.
+objs="commands.o job.o dir.o file.o misc.o main.o read.o remake.o rule.o implicit.o default.o variable.o expand.o function.o vpath.o version.o ar.o arscan.o signame.o getopt.o getopt1.o glob/glob.o glob/fnmatch.o remote-${REMOTE}.o ${extras} ${ALLOCA}"
+
+# Compile the source files into those objects.
+for file in `echo ${objs} | sed 's/\.o/.c/g'`; do
+  echo compiling ${file}...
+  $CC $CPPFLAGS $CFLAGS $defines -c \
+      -I. -I${srcdir} -I${srcdir}/glob ${srcdir}/$file
+done
+
+# The object files were actually all put in the current directory.
+# Remove the source directory names from the list.
+srcobjs="$objs"
+objs=
+for obj in $srcobjs; do
+  objs="$objs `basename $obj`"
+done
+
+# Link all the objects together.
+echo linking make...
+$CC $LDFLAGS $objs $LOADLIBES -o make.new
+echo done
+mv -f make.new make
--- a/build.template
+++ b/build.template
@@ -1,8 +1,8 @@
 #!/bin/sh
-
 # Shell script to build GNU Make in the absence of any `make' program.
+# @configure_input@

-# Copyright (C) 1993 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 # 
 # GNU Make is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 srcdir='@srcdir@'
 CC='@CC@'
 CFLAGS='@CFLAGS@'
+CPPFLAGS='@CPPFLAGS@'
 LDFLAGS='@LDFLAGS@'
 defines='@DEFS@ -DLIBDIR="${libdir}" -DINCLUDEDIR="${includedir}"'
 ALLOCA='@ALLOCA@'
@@ -32,9 +33,9 @@ extras='@LIBOBJS@'
 REMOTE='@REMOTE@'

 # Common prefix for machine-independent installed files.
-prefix=/usr/local
+prefix='@prefix@'
 # Common prefix for machine-dependent installed files.
-exec_prefix=/usr/local
+exec_prefix='@exec_prefix@'
 # Directory to find libraries in for `-lXXX'.
 libdir=${exec_prefix}/lib
 # Directory to search by default for included makefiles.
@@ -49,7 +50,8 @@ objs="%objs% remote-${REMOTE}.o ${extras} ${ALLOCA}"
 # Compile the source files into those objects.
 for file in `echo ${objs} | sed 's/\.o/.c/g'`; do
  echo compiling ${file}...
-  $CC $CFLAGS $defines -c -I. -I${srcdir} -I${srcdir}/glob ${srcdir}/$file
+  $CC $defines $CPPFLAGS $CFLAGS \
+      -c -I. -I${srcdir} -I${srcdir}/glob ${srcdir}/$file
 done

 # The object files were actually all put in the current directory.
--- a/commands.c
+++ b/commands.c
@@ -116,34 +116,64 @@ set_file_variables (file)
  DEFINE_VARIABLE ("@", 1, at);
  DEFINE_VARIABLE ("%", 1, percent);

-  /* Make sure that no dependencies are repeated.  This does not
-     really matter for the purpose of updating targets, but it
-     might make some names be listed twice for $^ and $?.  */
-
-  uniquize_deps (file->deps);
-
-  /* Compute the values for $^ and $?.  */
+  /* Compute the values for $^, $+, and $?.  */

  {
-    register unsigned int caret_len, qmark_len;
-    char *caret_value;
+    register unsigned int qmark_len, plus_len;
+    char *caret_value, *plus_value;
    register char *cp;
    char *qmark_value;
    register char *qp;
    register struct dep *d;
    unsigned int len;

-    caret_len = qmark_len = 0;
+    /* Compute first the value for $+, which is supposed to contain
+       duplicate dependencies as they were listed in the makefile.  */
+
+    plus_len = 0;
+    for (d = file->deps; d != 0; d = d->next)
+      plus_len += strlen (dep_name (d)) + 1;
+
+    len = plus_len == 0 ? 1 : plus_len;
+    cp = plus_value = (char *) alloca (len);
+
+    qmark_len = plus_len;	/* Will be this or less.  */
    for (d = file->deps; d != 0; d = d->next)
      {
-	register unsigned int i = strlen (dep_name (d)) + 1;
-	caret_len += i;
-	if (d->changed)
-	  qmark_len += i;
+	char *c = dep_name (d);
+
+#ifndef	NO_ARCHIVES
+	if (ar_name (c))
+	  {
+	    c = index (c, '(') + 1;
+	    len = strlen (c) - 1;
+	  }
+	else
+#endif
+	  len = strlen (c);
+
+	bcopy (c, cp, len);
+	cp += len;
+	*cp++ = ' ';
+
+	if (! d->changed)
+	  qmark_len -= len + 1;	/* Don't space in $? for this one.  */
      }

-    len = caret_len == 0 ? 1 : caret_len;
-    cp = caret_value = (char *) alloca (len);
+    /* Kill the last space and define the variable.  */
+
+    cp[cp > plus_value ? -1 : 0] = '\0';
+    DEFINE_VARIABLE ("+", 1, plus_value);
+
+    /* Make sure that no dependencies are repeated.  This does not
+       really matter for the purpose of updating targets, but it
+       might make some names be listed twice for $^ and $?.  */
+
+    uniquize_deps (file->deps);
+
+    /* Compute the values for $^ and $?.  */
+
+    cp = caret_value = plus_value; /* Reuse the buffer; it's big enough.  */
    len = qmark_len == 0 ? 1 : qmark_len;
    qp = qmark_value = (char *) alloca (len);

--- a/30
+++ b/30
@@ -1,7 +1,7 @@
 # NOTE: If you have no `make' program at all to process this makefile, run
 # `build.sh' instead.
 #
-# Copyright (C) 1988, 1989, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+# Copyright (C) 1988, 89, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 # 
 # GNU Make is free software; you can redistribute it and/or modify
@@ -30,11 +30,9 @@ srcdir = @srcdir@
 CC = @CC@

 CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@

-# How to invoke ranlib.  This is only used by the `glob' subdirectory.
-RANLIB = @RANLIB@
-
 # Define these for your system as follows:
 #	-DNO_ARCHIVES		To disable `ar' archive support.
 #	-DNO_FLOAT		To avoid using floating-point numbers.
@@ -77,9 +75,9 @@ LOADLIBES = @LIBS@
 extras = @LIBOBJS@

 # Common prefix for machine-independent installed files.
-prefix = /usr/local
+prefix = @prefix@
 # Common prefix for machine-dependent installed files.
-exec_prefix = $(prefix)
+exec_prefix = @exec_prefix@

 # Directory to install `make' in.
 bindir = $(exec_prefix)/bin
@@ -119,8 +117,8 @@ MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi

 # Programs to make tags files.
-ETAGS = etags -tw
-CTAGS = ctags -tw
+ETAGS = etags -w
+CTAGS = ctags -w

 objs = commands.o job.o dir.o file.o misc.o main.o read.o remake.o	\
       rule.o implicit.o default.o variable.o expand.o function.o	\
@@ -144,10 +142,9 @@ srcs = $(srcdir)/commands.c $(srcdir)/job.c $(srcdir)/dir.c		\
 .SUFFIXES: .o .c .h .ps .dvi .info .texinfo

 all: make
-check: # No tests.
 info: make.info
 dvi: make.dvi
-# Some makes apparently use .PHONY as the default goal is it is before `all'.
+# Some makes apparently use .PHONY as the default goal if it is before `all'.
 .PHONY: all check info dvi

 make.info: make.texinfo
@@ -166,17 +163,14 @@ make: $(objs)
 # -I. is needed to find config.h in the build directory.
 .c.o:
 	$(CC) $(defines) -c -I. -I$(srcdir) -I$(srcdir)/glob \
-	      $(CFLAGS) $< $(OUTPUT_OPTION)
+	      $(CPPFLAGS) $(CFLAGS) $< $(OUTPUT_OPTION)

 # For some losing Unix makes.
 SHELL = /bin/sh
 MAKE = make

 glob/libglob.a: FORCE config.h
-	cd glob; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS) -I..' \
-			 CPPFLAGS='$(CPPFLAGS) -DHAVE_CONFIG_H' \
-			 RANLIB='$(RANLIB)' \
-			 libglob.a
+	cd glob; $(MAKE) libglob.a
 FORCE:

 tagsrcs = $(srcs) $(srcdir)/remote-*.c
@@ -201,7 +195,7 @@ $(bindir)/$(binprefix)make: make
 	   else \
 	     echo "$@ needs to be owned by group $(group) and setgid;"; \
 	     echo "otherwise the \`-l' option will probably not work."; \
-	     echo "You may need special priveleges to install $@."; \
+	     echo "You may need special privileges to install $@."; \
 	   fi; \
 	 else true; fi
 # Some systems can't deal with renaming onto a running binary.
@@ -247,13 +241,15 @@ check: check-loadavg

 .PHONY: clean realclean distclean mostlyclean
 clean: glob-clean
-	-rm -f make loadavg *.o core make.info* make.dvi
+	-rm -f make loadavg *.o core make.dvi
 distclean: clean glob-realclean
 	-rm -f Makefile config.h config.status build.sh stamp-config
+	-rm -f config.log config.cache
 	-rm -f TAGS tags
 	-rm -f make.?? make.??s make.log make.toc make.*aux
 	-rm -f loadavg.c
 realclean: distclean
+	-rm -f make.info*
 mostlyclean: clean

 .PHONY: glob-clean glob-realclean
--- a/configure.in
+++ b/configure.in
@@ -1,78 +1,107 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION([$Id$])
-AC_INIT(vpath.c)		dnl A distinctive file to look for in srcdir.
+AC_PREREQ(2.1)dnl		dnl Minimum Autoconf version required.
+AC_INIT(vpath.c)dnl		dnl A distinctive file to look for in srcdir.
 AC_CONFIG_HEADER(config.h)
+AC_CONFIG_SUBDIRS(glob)		dnl Run configure in glob subdirectory.

 # We want these before the checks, so the checks can modify their values.
 test -z "$CFLAGS" && CFLAGS=-g AC_SUBST(CFLAGS)
 test -z "$LDFLAGS" && LDFLAGS=-g AC_SUBST(LDFLAGS)

-AC_SET_MAKE
+AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_RANLIB
 AC_PROG_CPP			dnl Later checks need this.
 AC_AIX
 AC_ISC_POSIX
 AC_MINIX
-AC_STDC_HEADERS
-AC_DIR_HEADER
-AC_UID_T			dnl Also does gid_t.
-AC_GETGROUPS_T
-AC_PID_T
-AC_RETSIGTYPE
-AC_HAVE_HEADERS(unistd.h limits.h sys/param.h fcntl.h string.h memory.h \
-	        sys/timeb.h)
-AC_MINUS_C_MINUS_O
-AC_CONST			dnl getopt needs this.
-AC_STAT_MACROS_BROKEN
+AC_HEADER_STDC
+AC_HEADER_DIRENT
+AC_TYPE_UID_T			dnl Also does gid_t.
+AC_TYPE_GETGROUPS
+AC_TYPE_PID_T
+AC_TYPE_SIGNAL
+AC_CHECK_HEADERS(unistd.h limits.h sys/param.h fcntl.h string.h memory.h \
+	         sys/timeb.h)
+AC_PROG_CC_C_O
+AC_C_CONST			dnl getopt needs this.
+AC_HEADER_STAT

 AC_SUBST(LIBOBJS)

-AC_HAVE_FUNCS(getdtablesize psignal \
-	      dup2 getcwd sigsetmask getgroups setlinebuf \
-	      seteuid setegid setreuid setregid strerror)
-AC_COMPILE_CHECK(sys_siglist, ,
-   [extern char *sys_siglist[]; puts(*sys_siglist);],
-   AC_DEFINE(HAVE_SYS_SIGLIST))
-AC_COMPILE_CHECK(_sys_siglist, ,
-   [extern char *_sys_siglist[]; puts(*_sys_siglist);],
-   AC_DEFINE(HAVE__SYS_SIGLIST))
-AC_ALLOCA
-AC_VFORK
-AC_SETVBUF_REVERSED
-AC_GETLOADAVG
-AC_STRCOLL
+AC_DEFUN(AC_CHECK_SYMBOL, [dnl
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL(ac_cv_check_symbol_$1, [dnl
+AC_TRY_LINK(, [extern char *sys_siglist[]; puts(*sys_siglist);],
+	    ac_cv_check_symbol_$1=yes, ac_cv_check_symbol_$1=no)])
+if test "$ac_cv_check_symbol_$1" = yes; then
+changequote(,)dnl
+  ac_tr_symbol=`echo $1 | tr '[a-z]' '[A-Z]'`
+changequote([,])dnl
+  AC_DEFINE_UNQUOTED(HAVE_${ac_tr_symbol})
+fi
+AC_MSG_RESULT($ac_cv_check_symbol_$1)])dnl

-dnl Check out the wait reality.
-AC_HAVE_HEADERS(sys/wait.h) AC_HAVE_FUNCS(waitpid wait3)
-AC_COMPILE_CHECK(union wait, [#include <sys/types.h>
+AC_CHECK_FUNCS(getdtablesize psignal mktemp \
+	       dup2 getcwd sigsetmask getgroups setlinebuf \
+	       seteuid setegid setreuid setregid strerror)
+AC_CHECK_SYMBOL(sys_siglist)
+AC_CHECK_SYMBOL(_sys_siglist)
+AC_FUNC_ALLOCA
+AC_FUNC_VFORK
+AC_FUNC_SETVBUF_REVERSED
+AC_FUNC_GETLOADAVG
+AC_FUNC_STRCOLL
+
+if test $ac_cv_func_getdtablesize = no; then
+  AC_MSG_CHECKING(for sysconf (_SC_OPEN_MAX))
+  AC_CACHE_VAL(make_cv_sysconf_open_max, [dnl
+  AC_TRY_LINK([#include <unistd.h>], [int max = sysconf (_SC_OPEN_MAX);],
+	      [make_cv_sysconf_open_max=yes], [make_cv_sysconf_open_max=no])])
+  if test $make_cv_sysconf_open_max = yes; then
+    AC_DEFINE(HAVE_SYSCONF_OPEN_MAX)
+  fi
+  AC_MSG_RESULT($make_cv_sysconf_open_max)
+fi
+
+# Check out the wait reality.
+AC_CHECK_HEADERS(sys/wait.h) AC_CHECK_FUNCS(waitpid wait3)
+AC_MSG_CHECKING(for union wait)
+AC_CACHE_VAL(make_cv_union_wait, [dnl
+AC_TRY_LINK([#include <sys/types.h>
 #include <sys/wait.h>],
-	 	 [union wait status; int pid; pid = wait (&status);
+	    [union wait status; int pid; pid = wait (&status);
 #ifdef WEXITSTATUS
 /* Some POSIXoid systems have both the new-style macros and the old
   union wait type, and they do not work together.  If union wait
   conflicts with WEXITSTATUS et al, we don't want to use it at all.  */
 if (WEXITSTATUS (status) != 0) pid = -1;
+#ifdef WTERMSIG
+/* If we have WEXITSTATUS and WTERMSIG, just use them on ints.  */
+-- blow chunks here --
+#endif
 #endif
 #ifdef HAVE_WAITPID
 /* Make sure union wait works with waitpid.  */
 pid = waitpid (-1, &status, 0);
 #endif
 ],
-		 AC_DEFINE(HAVE_UNION_WAIT))
+	    [make_cv_union_wait=yes], [make_cv_union_wait=no])])
+if test "$make_cv_union_wait" = yes; then
+  AC_DEFINE(HAVE_UNION_WAIT)
+fi
+AC_MSG_RESULT($make_cv_union_wait)

-AC_SYS_SIGLIST_DECLARED
+AC_DECL_SYS_SIGLIST

 # The presence of the following is not meant to imply
 # that make necessarily works on those systems.
-AC_DYNIX_SEQ
-AC_XENIX_DIR
-AC_IRIX_SUN
+AC_CHECK_LIB(sun, getpwnam)

 AC_SUBST(REMOTE) REMOTE=stub
-AC_WITH(customs, [REMOTE=cstms
-LIBS="$LIBS libcustoms.a"])
+AC_ARG_WITH(customs, [export jobs with the Customs daemon (NOT SUPPORTED)],
+[REMOTE=cstms LIBS="$LIBS libcustoms.a"])

 echo checking for location of SCCS get command
 if test -f /usr/sccs/get; then
@@ -94,7 +123,7 @@ if ( /usr/sccs/admin -n s.conftest || admin -n s.conftest ) >/dev/null 2>&1 &&
 fi
 rm -f s.conftest conftoast

-AC_OUTPUT(Makefile build.sh glob/Makefile, [
+AC_OUTPUT(Makefile build.sh, [
 # Makefile uses this timestamp file to know when to remake Makefile,
 # build.sh, and glob/Makefile.
 touch stamp-config])
--- a/default.c
+++ b/default.c
@@ -1,5 +1,5 @@
 /* Data base of default implicit rules for GNU Make.
-Copyright (C) 1988, 89, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
+Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -209,13 +209,7 @@ static char *default_suffix_rules[] =
 static char *default_variables[] =
  {
    "AR", "ar",
-#ifndef __hpux
    "ARFLAGS", "rv",
-#else
-    /* HPUX ar's f flag says to truncate the file names to archive member
-       name length in comparisons, so replacement notices the equality.  */
-    "ARFLAGS", "rfv",
-#endif
    "AS", "as",
 #ifdef GCC_IS_NATIVE
    "CC", "gcc",
--- a/dir.c
+++ b/dir.c
@@ -18,26 +18,26 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */

 #include "make.h"

-#if	defined (POSIX) || defined (DIRENT) || defined (__GNU_LIBRARY__)
+#if	defined (POSIX) || defined (HAVE_DIRENT_H) || defined (__GNU_LIBRARY__)
 #include <dirent.h>
 #ifndef	__GNU_LIBRARY__
 #define D_NAMLEN(d) strlen((d)->d_name)
 #else	/* GNU C library.  */
 #define D_NAMLEN(d) ((d)->d_namlen)
 #endif	/* Not GNU C library.  */
-#else	/* Not POSIX or DIRENT.  */
+#else	/* Not POSIX or HAVE_DIRENT_H.  */
 #define direct dirent
 #define D_NAMLEN(d) ((d)->d_namlen)
-#ifdef	SYSNDIR
+#ifdef	HAVE_SYS_NDIR_H
 #include <sys/ndir.h>
-#endif	/* SYSNDIR */
-#ifdef	SYSDIR
+#endif	/* HAVE_SYS_NDIR_H */
+#ifdef	HAVE_SYS_DIR_H
 #include <sys/dir.h>
-#endif	/* SYSDIR */
-#ifdef NDIR
+#endif	/* HAVE_SYS_DIR_H */
+#ifdef HAVE_NDIR_H
 #include <ndir.h>
-#endif	/* NDIR */
-#endif	/* POSIX or DIRENT or __GNU_LIBRARY__.  */
+#endif	/* HAVE_NDIR_H */
+#endif	/* POSIX or HAVE_DIRENT_H or __GNU_LIBRARY__.  */

 #if defined (POSIX) && !defined (__GNU_LIBRARY__)
 /* Posix does not require that the d_ino field be present, and some
@@ -48,7 +48,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif /* POSIX */

 #ifdef __MSDOS__
-#inlcude <ctype.h>
+#include <ctype.h>

 static char *
 dosify (filename)
--- a/expand.c
+++ b/expand.c
@@ -1,5 +1,5 @@
 /* Variable expansion functions for GNU Make.
-Copyright (C) 1988, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
+Copyright (C) 1988, 89, 91, 92, 93, 95 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -197,9 +197,9 @@ variable_expand (line)
 	    char openparen = *p;
 	    char closeparen = (openparen == '(') ? ')' : '}';
 	    register char *beg = p + 1;
+	    int free_beg = 0;
 	    char *op, *begp;
-	    char *end;
-	    char *colon = 0;
+	    char *end, *colon;

 	    op = o;
 	    begp = p;
@@ -213,10 +213,18 @@ variable_expand (line)
 	    /* Is there a variable reference inside the parens or braces?
 	       If so, expand it before expanding the entire reference.  */

-	    p1 = index (beg, closeparen);
+	    end = index (beg, closeparen);
+	    if (end == 0)
+	      {
+		/* Unterminated variable reference.  */
+		if (reading_filename != 0)
+		  makefile_fatal (reading_filename, *reading_lineno_ptr,
+				  "unterminated variable reference");
+		else
+		  fatal ("unterminated variable reference");
+	      }
+	    p1 = lindex (beg, end, '$');
 	    if (p1 != 0)
-	      p1 = lindex (beg, p1, '$');
-	    if (p1 != 0 && lindex (beg, p1, ':') == 0)
 	      {
 		/* BEG now points past the opening paren or brace.
 		   Count parens or braces until it is matched.  */
@@ -227,133 +235,107 @@ variable_expand (line)
 		      ++count;
 		    else if (*p == closeparen && --count < 0)
 		      break;
-		    else if (colon == 0 && count == 0 && *p == ':')
-		      /* Record where we found a colon, which
-			 indicates a substitution reference.
-			 We want to expand the text before the
-			 reference only.  */
-		      colon = p;
 		  }
 		/* If COUNT is >= 0, there were unmatched opening parens
 		   or braces, so we go to the simple case of a variable name
 		   such as `$($(a)'.  */
 		if (count < 0)
 		  {
-		    char *name = expand_argument (beg, colon == 0 ? p : colon);
-		    unsigned int namelen = strlen (name);
-		    if (colon == 0)
-		      {
-			/* This is a simple reference to the expanded name.  */
-			o = reference_variable (o, name, namelen);
-			free (name);
-			break;
-		      }
-		    else
-		      {
-			/* This is a substitution reference to the expanded
-			   name.  We replace the pending text with a copy
-			   containing the expanded name in place of the
-			   original name, and then fall through to
-			   the normal substitution reference code below.  */
-			unsigned int restlen = strlen (colon) + 1;
-			beg = (char *) alloca (namelen + restlen);
-			bcopy (name, beg, namelen);
-			bcopy (colon, &beg[namelen], restlen);
-			/* Point COLON into the new copy.  */
-			colon = &beg[namelen];
-		      }
+		    beg = expand_argument (beg, p); /* Expand the name.  */
+		    free_beg = 1; /* Remember to free BEG when finished.  */
+		    end = index (beg, '\0');
 		  }
 	      }
+	    else
+	      /* Advance P to the end of this reference.  After we are
+                 finished expanding this one, P will be incremented to
+                 continue the scan.  */
+	      p = end;

 	    /* This is not a reference to a built-in function and
-	       it does not contain any variable references inside.
-	       There are several things it could be.  */
+	       any variable references inside are now expanded.
+	       Is the resultant text a substitution reference?  */

-	    if (colon == 0)
-	      colon = index (beg, ':');
-	    if (colon != 0 && lindex (beg, colon, closeparen) == 0)
+	    colon = lindex (beg, end, ':');
+	    if (colon != 0)
 	      {
-		/* This is a substitution reference: $(FOO:A=B).  */
-		int count;
+		/* This looks like a substitution reference: $(FOO:A=B).  */
 		char *subst_beg, *subst_end, *replace_beg, *replace_end;

-		v = lookup_variable (beg, colon - beg);
-		if (v == 0)
-		  warn_undefined (beg, colon - beg);
-
 		subst_beg = colon + 1;
-		count = 0;
-		for (p = subst_beg; *p != '\0'; ++p)
+		subst_end = index (subst_beg, '=');
+		if (subst_end == 0)
+		  /* There is no = in sight.  Punt on the substitution
+		     reference and treat this as a variable name containing
+		     a colon, in the code below.  */
+		  colon = 0;
+		else
 		  {
-		    if (*p == openparen)
-		      ++count;
-		    else if (*p == closeparen)
-		      --count;
-		    else if (*p == '=' && count <= 0)
-		      break;
+		    replace_beg = subst_end + 1;
+		    replace_end = end;
+
+		    /* Extract the variable name before the colon
+		       and look up that variable.  */
+		    v = lookup_variable (beg, colon - beg);
+		    if (v == 0)
+		      warn_undefined (beg, colon - beg);
+
+		    if (v != 0 && *v->value != '\0')
+		      {
+			char *value = (v->recursive ? recursively_expand (v)
+				       : v->value);
+			char *pattern, *percent;
+			if (free_beg)
+			  {
+			    *subst_end = '\0';
+			    pattern = subst_beg;
+			  }
+			else
+			  {
+			    pattern = alloca (subst_end - subst_beg + 1);
+			    bcopy (subst_beg, pattern, subst_end - subst_beg);
+			    pattern[subst_end - subst_beg] = '\0';
+			  }
+			percent = find_percent (pattern);
+			if (percent != 0)
+			  {
+			    char *replace;
+			    if (free_beg)
+			      {
+				*replace_end = '\0';
+				replace = replace_beg;
+			      }
+			    else
+			      {
+				replace = alloca (replace_end - replace_beg
+						  + 1);
+				bcopy (replace_beg, replace,
+				       replace_end - replace_beg);
+				replace[replace_end - replace_beg] = '\0';
+			      }
+			    
+			    o = patsubst_expand (o, value, pattern, replace,
+						 percent, (char *) 0);
+			  }
+			else
+			  o = subst_expand (o, value,
+					    pattern, replace_beg,
+					    strlen (pattern),
+					    end - replace_beg,
+					    0, 1);
+			if (v->recursive)
+			  free (value);
+		      }
 		  }
-		if (count > 0)
-		  /* There were unmatched opening parens.  */
-		  return initialize_variable_output ();
-		subst_end = p;
-
-		replace_beg = p + 1;
-		count = 0;
-		for (p = replace_beg; *p != '\0'; ++p)
-		  {
-		    if (*p == openparen)
-		      ++count;
-		    else if (*p == closeparen && --count < 0)
-		      break;
-		  }
-		if (count > 0)
-		  /* There were unmatched opening parens.  */
-		  return initialize_variable_output ();
-		end = p;
-		replace_end = p;
-
-		p = expand_argument (subst_beg, subst_end);
-		p1 = expand_argument (replace_beg, replace_end);
-
-		if (v != 0 && *v->value != '\0')
-		  {
-		    char *value = (v->recursive ? recursively_expand (v)
-				   : v->value);
-		    char *percent = find_percent (p);
-		    if (percent != 0)
-		      o = patsubst_expand (o, value, p, p1,
-					   percent, (char *) 0);
-		    else
-		      o = subst_expand (o, value,
-					p, p1, strlen (p), strlen (p1),
-					0, 1);
-		    if (v->recursive)
-		      free (value);
-		  }
-
-		free (p);
-		free (p1);
 	      }

-	    /* No, this must be an ordinary variable reference.  */
-	    else
-	      {
-		/* Look up the value of the variable.  */
-		end = index (beg, closeparen);
-		if (end == 0)
-		  {
-		    /* Unterminated variable reference.  */
-		    if (reading_filename != 0)
-		      makefile_fatal (reading_filename, *reading_lineno_ptr,
-				      "unterminated variable reference");
-		    else
-		      fatal ("unterminated variable reference");
-		  }
+	    if (colon == 0)
+	      /* This is an ordinary variable reference.
+		 Look up the value of the variable.  */
 		o = reference_variable (o, beg, end - beg);
-	      }

-	    /* Advance p past the variable reference to resume scan.  */
-	    p = end;
+	  if (free_beg)
+	    free (beg);
 	  }
 	  break;

--- a/file.c
+++ b/file.c
@@ -383,6 +383,32 @@ snap_deps ()
  f = lookup_file (".EXPORT_ALL_VARIABLES");
  if (f != 0 && f->is_target)
    export_all_variables = 1;
+
+  f = lookup_file (".IGNORE");
+  if (f != 0 && f->is_target)
+    {
+      if (f->deps == 0)
+	ignore_errors_flag = 1;
+      else
+	for (d = f->deps; d != 0; d = d->next)
+	  for (f2 = d->file; f2 != 0; f2 = f2->prev)
+	    f2->command_flags |= COMMANDS_NOERROR;
+    }
+
+  f = lookup_file (".SILENT");
+  if (f != 0 && f->is_target)
+    {
+      if (f->deps == 0)
+	silent_flag = 1;
+      else
+	for (d = f->deps; d != 0; d = d->next)
+	  for (f2 = d->file; f2 != 0; f2 = f2->prev)
+	    f2->command_flags |= COMMANDS_SILENT;
+    }
+
+  f = lookup_file (".POSIX");
+  if (f != 0 && f->is_target)
+    posix_pedantic = 1;
 }

 /* Set the `command_state' member of FILE and all its `also_make's.  */
--- a/file.h
+++ b/file.h
@@ -25,7 +25,8 @@ struct file
    struct file *next;
    char *name;
    struct dep *deps;
-    struct commands *cmds;	/* Commands to execute for this target */
+    struct commands *cmds;	/* Commands to execute for this target.  */
+    int command_flags;		/* Flags OR'd in for cmds; see commands.h.  */
    char *stem;			/* Implicit stem, if an implicit
    				   rule has been used */
    struct dep *also_make;	/* Targets that are made by making this.  */
--- a/getloadavg.c
+++ b/getloadavg.c
@@ -1,5 +1,5 @@
 /* Get the system load averages.
-   Copyright (C) 1985, 86, 87, 88, 89, 91, 92, 93, 1994
+   Copyright (C) 1985, 86, 87, 88, 89, 91, 92, 93, 1994, 1995
   	Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
@@ -59,6 +59,11 @@
   We also #define LDAV_PRIVILEGED if a program will require
   special installation to be able to call getloadavg.  */

+/* This should always be first.  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <sys/types.h>

 /* Both the Emacs and non-Emacs sections want this.  Some
@@ -69,17 +74,6 @@
 #endif


-#ifdef HAVE_CONFIG_H
-#if defined (emacs) || defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
-#include <config.h>
-#else
-#include "config.h"
-#endif
-#endif
-
 /* Exclude all the code except the test program at the end
   if the system has its own `getloadavg' function.

@@ -149,6 +143,7 @@ extern int errno;

 #if defined (__osf__) && (defined (__alpha) || defined (__alpha__))
 #define OSF_ALPHA
+#include <sys/table.h>
 #endif

 #if defined (__osf__) && (defined (mips) || defined (__mips__))
@@ -211,6 +206,10 @@ extern int errno;
 #define LOAD_AVE_TYPE long
 #endif

+#if defined(alliant) && defined(i860) /* Alliant FX/2800 */
+#define LOAD_AVE_TYPE long
+#endif
+
 #endif /* No LOAD_AVE_TYPE.  */

 #ifdef OSF_ALPHA
@@ -220,6 +219,13 @@ extern int errno;
 #define FSCALE 1024.0
 #endif

+#if defined(alliant) && defined(i860) /* Alliant FX/2800 */
+/* <sys/param.h> defines an incorrect value for FSCALE on an
+   Alliant FX/2800 Concentrix 2.2, according to ghazi@noc.rutgers.edu.  */
+#undef FSCALE
+#define FSCALE 100.0
+#endif
+

 #ifndef	FSCALE

@@ -297,7 +303,7 @@ extern int errno;
 #define NLIST_STRUCT
 #endif

-#ifdef tex4300
+#ifdef tek4300
 #define NLIST_STRUCT
 #endif

@@ -305,6 +311,10 @@ extern int errno;
 #define NLIST_STRUCT
 #endif

+#if defined(alliant) && defined(i860) /* Alliant FX/2800 */
+#define NLIST_STRUCT
+#endif
+
 #endif /* defined (NLIST_STRUCT) */


@@ -702,6 +712,18 @@ getloadavg (loadavg, nelem)
       : (load_ave.tl_avenrun.l[0] / (double) load_ave.tl_lscale));
 #endif	/* OSF_MIPS */

+#if !defined (LDAV_DONE) && defined (OSF_ALPHA)
+#define LDAV_DONE
+
+  struct tbl_loadavg load_ave;
+  table (TBL_LOADAVG, 0, &load_ave, 1, sizeof (load_ave));
+  for (elem = 0; elem < nelem; elem++)
+    loadavg[elem]
+      = (load_ave.tl_lscale == 0
+       ? load_ave.tl_avenrun.d[elem]
+       : (load_ave.tl_avenrun.l[elem] / (double) load_ave.tl_lscale));
+#endif /* OSF_ALPHA */
+
 #if !defined (LDAV_DONE) && defined (VMS)
  /* VMS specific code -- read from the Load Ave driver.  */

--- a/implicit.c
+++ b/implicit.c
@@ -262,7 +262,7 @@ pattern_search (file, archive, depth, recursions)
    }

  /* If we have found a matching rule that won't match all filenames,
-     retroactively reject any "terminal" rules that do always match.  */
+     retroactively reject any non-"terminal" rules that do always match.  */
  if (specific_rule_matched)
    for (i = 0; i < nrules; ++i)
      if (!tryrules[i]->terminal)
--- a/job.c
+++ b/job.c
@@ -1,5 +1,5 @@
 /* Job execution and handling for GNU Make.
-Copyright (C) 1988, 89, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
+Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -21,9 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "job.h"
 #include "file.h"
 #include "variable.h"
-
-/* Default path to search for executables.  */
-static char default_path[] = ":/bin:/usr/bin";
+#include <assert.h>

 /* Default shell to use.  */
 char default_shell[] = "/bin/sh";
@@ -124,6 +122,9 @@ extern int setgid (), getgid ();
 #ifdef HAVE_GETDTABLESIZE
 extern int getdtablesize ();
 #else
+#ifdef HAVE_SYSCONF_OPEN_MAX
+#define getdtablesize()		((int) sysconf (_SC_OPEN_MAX))
+#else
 #include <sys/param.h>
 #define getdtablesize() NOFILE
 #if !defined (NOFILE) && defined (NOFILES_MAX)
@@ -132,6 +133,7 @@ extern int getdtablesize ();
 #endif
 #endif
 #endif
+#endif

 extern int getloadavg ();
 extern int start_remote_job_p ();
@@ -378,9 +380,15 @@ reap_children (block, err)
 	    {
 	      /* The commands failed.  Write an error message,
 		 delete non-precious targets, and abort.  */
+	      static int delete_on_error = -1;
 	      child_error (c->file->name, exit_code, exit_sig, coredump, 0);
 	      c->file->update_status = 1;
-	      if (exit_sig != 0)
+	      if (delete_on_error == -1)
+		{
+		  struct file *f = lookup_file (".DELETE_ON_ERROR");
+		  delete_on_error = f != 0 && f->is_target;
+		}
+	      if (exit_sig != 0 || delete_on_error)
 		delete_child_targets (c);
 	    }
 	  else
@@ -402,7 +410,6 @@ reap_children (block, err)
 			 Since there are more commands that wanted to be run,
 			 the target was not completely remade.  So we treat
 			 this as if a command had failed.  */
-		      c->file->command_state = cs_finished;
 		      c->file->update_status = 1;
 		    }
 		  else
@@ -413,30 +420,29 @@ reap_children (block, err)
 			 by start_remote_job_p.  */
 		      c->remote = start_remote_job_p ();
 		      start_job_command (c);
+		      if (c->file->command_state == cs_running)
+			/* We successfully started the new command.
+			   Loop to reap more children.  */
+			continue;
 		    }
-		}

-	      switch (c->file->command_state)
-		{
-		case cs_running:
-		  /* Successfully started.  Loop to reap more children.  */
-		  continue;
-
-		case cs_finished:
 		  if (c->file->update_status != 0)
 		    /* We failed to start the commands.  */
 		    delete_child_targets (c);
-		  break;
-
-		default:
-		  error ("internal error: `%s' has bogus command_state \
-%d in reap_children",
-			 c->file->name, (int) c->file->command_state);
-		  abort ();
-		  break;
 		}
+	      else
+		/* There are no more commands.  We got through them all
+		   without an unignored error.  Now the target has been
+		   successfully updated.  */
+		c->file->update_status = 0;
 	    }

+	  /* When we get here, all the commands for C->file are finished
+	     (or aborted) and C->file->update_status contains 0 or 1.  But
+	     C->file->command_state is still cs_running if all the commands
+	     ran; notice_finish_file looks for cs_running to tell it that
+	     it's interesting to check the file's modtime again now.  */
+
 	  if (! handling_fatal_signal)
 	    /* Notice if the target of the commands has been changed.
 	       This also propagates its values for command_state and
@@ -524,9 +530,14 @@ start_job_command (child)
 {
  static int bad_stdin = -1;
  register char *p;
-  int flags = child->file->cmds->lines_flags[child->command_line - 1];
+  int flags;
  char **argv;

+  /* Combine the flags parsed for the line itself with
+     the flags specified globally for this target.  */
+  flags = (child->file->command_flags
+	   | child->file->cmds->lines_flags[child->command_line - 1]);
+
  p = child->command_ptr;
  child->noerror = flags & COMMANDS_NOERROR;
  while (*p != '\0')
@@ -584,6 +595,12 @@ start_job_command (child)
      /* This line has no commands.  Go to the next.  */
      if (job_next_command (child))
 	start_job_command (child);
+      else
+	{
+	  /* No more commands.  All done.  */
+	  child->file->update_status = 0;
+	  notice_finished_file (child->file);
+	}
      return;
    }

@@ -609,6 +626,7 @@ start_job_command (child)
      free ((char *) argv);
      if (job_next_command (child))
 	start_job_command (child);
+      child->file->update_status = 0;
      return;
    }

@@ -672,6 +690,8 @@ start_job_command (child)
    {
      /* Fork the child process.  */

+      char **parent_environ;
+
 #ifdef	 POSIX
      (void) sigprocmask (SIG_BLOCK, &fatal_signal_set, (sigset_t *) 0);
 #else
@@ -681,7 +701,9 @@ start_job_command (child)
 #endif

      child->remote = 0;
+      parent_environ = environ;
      child->pid = vfork ();
+      environ = parent_environ;	/* Restore value child may have clobbered.  */
      if (child->pid == 0)
 	{
 	  /* We are the child side.  */
@@ -751,7 +773,7 @@ start_waiting_job (c)
    {
      /* Put this child on the chain of children waiting
 	 for the load average to go down.  */
-      c->file->command_state = cs_running;
+      set_command_state (c->file, cs_running);
      c->next = waiting_jobs;
      waiting_jobs = c;
      return 0;
@@ -774,15 +796,18 @@ start_waiting_job (c)
      unblock_sigs ();
      break;

+    case cs_not_started:
+      /* All the command lines turned out to be empty.  */
+      c->file->update_status = 0;
+      /* FALLTHROUGH */
+
    case cs_finished:
      notice_finished_file (c->file);
      free_child (c);
      break;

    default:
-      error ("internal error: `%s' command_state == %d in new_job",
-	     c->file->name, (int) c->file->command_state);
-      abort ();
+      assert (c->file->command_state == cs_finished);
      break;
    }

@@ -928,8 +953,11 @@ new_job (file)

  /* Fetch the first command line to be run.  */
  if (! job_next_command (c))
-    /* There were no commands!  */
-    free_child (c);
+    {
+      /* There were no commands!  */
+      free_child (c);
+      c->file->update_status = 0;
+    }
  else
    {
      /* The job is now primed.  Start it running.  */
@@ -957,8 +985,6 @@ job_next_command (child)
 	{
 	  /* There are no more lines to be expanded.  */
 	  child->command_ptr = 0;
-	  child->file->command_state = cs_finished;
-	  child->file->update_status = 0;
 	  return 0;
 	}
      else
@@ -1052,6 +1078,11 @@ child_execute_job (stdin_fd, stdout_fd, argv, envp)
  exec_command (argv, envp);
 }

+#if 0
+
+/* Default path to search for executables.  */
+static char default_path[] = ":/bin:/usr/bin";
+
 /* Search PATH for FILE.
   If successful, store the full pathname in PROGRAM and return 1.
   If not sucessful, return zero.  */
@@ -1150,6 +1181,7 @@ search_path (file, path, program)

  return 0;
 }
+#endif /* search_path commented out */

 /* Replace the current process with one running the command in ARGV,
   with environment ENVP.  This function does not return.  */
@@ -1158,82 +1190,65 @@ void
 exec_command (argv, envp)
     char **argv, **envp;
 {
-  char *shell, *path;
-  PATH_VAR (program);
-  register char **ep;
-
-  shell = path = 0;
-  for (ep = envp; *ep != 0; ++ep)
-    {
-      if (shell == 0 && !strncmp(*ep, "SHELL=", 6))
-	shell = &(*ep)[6];
-      else if (path == 0 && !strncmp(*ep, "PATH=", 5))
-	path = &(*ep)[5];
-      else if (path != 0 && shell != 0)
-	break;
-    }
-
  /* Be the user, permanently.  */
  child_access ();

-  if (!search_path (argv[0], path, program))
-    error ("%s: Command not found", argv[0]);
-  else
+  /* Run the program.  */
+  environ = envp;
+  execvp (argv[0], argv);
+  
+  switch (errno)
    {
-      /* Run the program.  */
-      execve (program, argv, envp);
+    case ENOENT:
+      error ("%s: Command not found", argv[0]);
+      break;
+    case ENOEXEC:
+      {
+	/* The file is not executable.  Try it as a shell script.  */
+	extern char *getenv ();
+	char *shell;
+	char **new_argv;
+	int argc;

-      if (errno == ENOEXEC)
-	{
-	  PATH_VAR (shell_program);
-	  char *shell_path;
-	  if (shell == 0)
-	    shell_path = default_shell;
-	  else
-	    {
-	      if (search_path (shell, path, shell_program))
-		shell_path = shell_program;
-	      else
-		{
-		  shell_path = 0;
-		  error ("%s: Shell program not found", shell);
-		}
-	    }
+	shell = getenv ("SHELL");
+	if (shell == 0)
+	  shell = default_shell;

-	  if (shell_path != 0)
-	    {
-	      char **new_argv;
-	      int argc;
+	argc = 1;
+	while (argv[argc] != 0)
+	  ++argc;

-	      argc = 1;
-	      while (argv[argc] != 0)
-		++argc;
+	new_argv = (char **) alloca ((1 + argc + 1) * sizeof (char *));
+	new_argv[0] = shell;
+	new_argv[1] = program;
+	while (argc > 0)
+	  {
+	    new_argv[1 + argc] = argv[argc];
+	    --argc;
+	  }

-	      new_argv = (char **) alloca ((1 + argc + 1) * sizeof (char *));
-	      new_argv[0] = shell_path;
-	      new_argv[1] = program;
-	      while (argc > 0)
-		{
-		  new_argv[1 + argc] = argv[argc];
-		  --argc;
-		}
+	execvp (shell, new_argv);
+	if (errno == ENOENT)
+	  error ("%s: Shell program not found", shell);
+	else
+	  perror_with_name ("execvp: ", shell);
+	break;
+      }

-	      execve (shell_path, new_argv, envp);
-	      perror_with_name ("execve: ", shell_path);
-	    }
-	}
-      else
-	perror_with_name ("execve: ", program);
+    default:
+      perror_with_name ("execvp: ", argv[0]);
+      break;
    }

  _exit (127);
 }

-/* Figure out the argument list necessary to run LINE as a command.
-   Try to avoid using a shell.  This routine handles only ' quoting.
-   Starting quotes may be escaped with a backslash.  If any of the
-   characters in sh_chars[] is seen, or any of the builtin commands
-   listed in sh_cmds[] is the first word of a line, the shell is used.
+/* Figure out the argument list necessary to run LINE as a command.  Try to
+   avoid using a shell.  This routine handles only ' quoting, and " quoting
+   when no backslash, $ or ` characters are seen in the quotes.  Starting
+   quotes may be escaped with a backslash.  If any of the characters in
+   sh_chars[] is seen, or any of the builtin commands listed in sh_cmds[]
+   is the first word of a line, the shell is used.

   If RESTP is not NULL, *RESTP is set to point to the first newline in LINE.
   If *RESTP is NULL, newlines will be ignored.
@@ -1311,7 +1326,7 @@ construct_command_argv_internal (line, restp, shell, ifs)
 	string_char:
 	  /* Inside a string, just copy any char except a closing quote
 	     or a backslash-newline combination.  */
-	  if (*p == '\'')
+	  if (*p == instring)
 	    instring = 0;
 	  else if (*p == '\\' && p[1] == '\n')
 	    goto swallow_escaped_newline;
@@ -1321,6 +1336,10 @@ construct_command_argv_internal (line, restp, shell, ifs)
 	      *restp = p;
 	      goto end_of_line;
 	    }
+	  /* Backslash, $, and ` are special inside double quotes.
+	     If we see any of those, punt.  */
+	  else if (instring == '"' && index ("\\$`", *p) != 0)
+	    goto slow;
 	  else
 	    *ap++ = *p;
 	}
@@ -1378,7 +1397,8 @@ construct_command_argv_internal (line, restp, shell, ifs)
 	    break;

 	  case '\'':
-	    instring = 1;
+	  case '"':
+	    instring = *p;
 	    break;

 	  case '\n':
@@ -1543,7 +1563,7 @@ construct_command_argv_internal (line, restp, shell, ifs)
 	    continue;
 	  }

-	if (*p == '\\' || *p == '\''
+	if (*p == '\\' || *p == '\'' || *p == '"'
 	    || isspace (*p)
 	    || index (sh_chars, *p) != 0)
 	  *ap++ = '\\';
@@ -1559,11 +1579,12 @@ construct_command_argv_internal (line, restp, shell, ifs)
  return new_argv;
 }

-/* Figure out the argument list necessary to run LINE as a command.
-   Try to avoid using a shell.  This routine handles only ' quoting.
-   Starting quotes may be escaped with a backslash.  If any of the
-   characters in sh_chars[] is seen, or any of the builtin commands
-   listed in sh_cmds[] is the first word of a line, the shell is used.
+/* Figure out the argument list necessary to run LINE as a command.  Try to
+   avoid using a shell.  This routine handles only ' quoting, and " quoting
+   when no backslash, $ or ` characters are seen in the quotes.  Starting
+   quotes may be escaped with a backslash.  If any of the characters in
+   sh_chars[] is seen, or any of the builtin commands listed in sh_cmds[]
+   is the first word of a line, the shell is used.

   If RESTP is not NULL, *RESTP is set to point to the first newline in LINE.
   If *RESTP is NULL, newlines will be ignored.
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
 /* Argument parsing and main program of GNU Make.
-Copyright (C) 1988, 89, 90, 91, 94 Free Software Foundation, Inc.
+Copyright (C) 1988, 89, 90, 91, 94, 1995 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -46,6 +46,7 @@ static void log_working_directory ();
 static void print_data_base (), print_version ();
 static void decode_switches (), decode_env_switches ();
 static void define_makeflags ();
+static char *quote_as_word ();

 /* The structure that describes an accepted command switch.  */

@@ -271,13 +272,13 @@ static const struct command_switch switches[] =
    { 'w', flag, (char *) &print_directory_flag, 1, 1, 0, 0, 0,
 	"print-directory", 0,
 	"Print the current directory" },
-    { 1, flag, (char *) &inhibit_print_directory_flag, 1, 1, 0, 0, 0,
+    { 2, flag, (char *) &inhibit_print_directory_flag, 1, 1, 0, 0, 0,
 	"no-print-directory", 0,
 	"Turn off -w, even if it was turned on implicitly" },
    { 'W', string, (char *) &new_files, 0, 0, 0, 0, 0,
 	"what-if", "FILE",
 	"Consider FILE to be infinitely new" },
-    { 2, flag, (char *) &warn_undefined_variables_flag, 1, 1, 0, 0, 0,
+    { 3, flag, (char *) &warn_undefined_variables_flag, 1, 1, 0, 0, 0,
 	"warn-undefined-variables", 0,
 	"Warn when an undefined variable is referenced" },
    { '\0', }
@@ -345,6 +346,11 @@ struct file *default_goal_file;
   This is zero if the makefiles do not define .DEFAULT.  */

 struct file *default_file;
+
+/* Nonzero if we have seen the magic `.POSIX' target.
+   This turns on pedantic compliance with POSIX.2.  */
+
+int posix_pedantic;

 /* Mask of signals that are being caught with fatal_error_signal.  */

@@ -391,6 +397,15 @@ enter_command_line_file (name)
  return enter_file (savestring (name, strlen (name)));
 }

+/* Toggle -d on receipt of SIGUSR1.  */
+
+static RETSIGTYPE
+debug_signal_handler (sig)
+     int sig;
+{
+  debug_flag = ! debug_flag;
+}
+
 int
 main (argc, argv, envp)
     int argc;
@@ -563,6 +578,53 @@ main (argc, argv, envp)
  (void) define_variable ("MAKE_COMMAND", 12, argv[0], o_default, 0);
  (void) define_variable ("MAKE", 4, "$(MAKE_COMMAND)", o_default, 1);

+  if (command_variables != 0)
+    {
+      struct command_variable *cv;
+      struct variable *v;
+      unsigned int len = 0;
+      char *value, *p;
+
+      /* Figure out how much space will be taken up by the command-line
+	 variable definitions.  */
+      for (cv = command_variables; cv != 0; cv = cv->next)
+	{
+	  v = cv->variable;
+	  len += 2 * strlen (v->name);
+	  if (! v->recursive)
+	    ++len;
+	  ++len;
+	  len += 2 * strlen (v->value);
+	}
+
+      /* Now allocate a buffer big enough and fill it.  */
+      p = value = alloca (len);
+      for (cv = command_variables; cv != 0; cv = cv->next)
+	{
+	  v = cv->variable;
+	  p = quote_as_word (p, v->name, 0);
+	  if (! v->recursive)
+	    *p++ = ':';
+	  *p++ = '=';
+	  p = quote_as_word (p, v->value, 0);
+	  *p++ = ' ';
+	}
+      p[-1] = '\0';		/* Kill the final space and terminate.  */
+
+      /* Define an unchangeable variable with a name that no POSIX.2
+	 makefile could validly use for its own variable.  */
+      (void) define_variable ("-*-command-variables-*-", 23,
+			      value, o_automatic, 0);
+
+      /* Define the variable; this will not override any user definition.
+         Normally a reference to this variable is written into the value of
+         MAKEFLAGS, allowing the user to override this value to affect the
+         exported value of MAKEFLAGS.  In POSIX-pedantic mode, we cannot
+         allow the user's setting of MAKEOVERRIDES to affect MAKEFLAGS, so
+         a reference to this hidden variable is written instead. */
+      (void) define_variable ("MAKEOVERRIDES", 13,
+			      "${-*-command-variables-*-}", o_env, 1);
+    }

  /* If there were -C flags, move ourselves about.  */
  if (directories != 0)
@@ -638,11 +700,16 @@ main (argc, argv, envp)
 	    /* This makefile is standard input.  Since we may re-exec
 	       and thus re-read the makefiles, we read standard input
 	       into a temporary file and read from that.  */
-	    static char name[] = "/tmp/GmXXXXXX";
 	    FILE *outfile;

 	    /* Make a unique filename.  */
+#ifdef HAVE_MKTEMP
+	    static char name[] = "/tmp/GmXXXXXX";
 	    (void) mktemp (name);
+#else
+	    static char name[L_tmpnam];
+	    (void) tmpnam ();
+#endif

 	    outfile = fopen (name, "w");
 	    if (outfile == 0)
@@ -691,6 +758,11 @@ main (argc, argv, envp)
  (void) signal (SIGCLD, child_handler);
 #endif

+  /* Let the user send us SIGUSR1 to toggle the -d flag during the run.  */
+#ifdef SIGUSR1
+  (void) signal (SIGUSR1, debug_signal_handler);
+#endif
+
  /* Define the initial list of suffixes for old-style rules.  */

  set_default_suffixes ();
@@ -732,12 +804,8 @@ main (argc, argv, envp)

  define_makeflags (1, 0);

-  ignore_errors_flag |= lookup_file (".IGNORE") != 0;
-
-  silent_flag |= lookup_file (".SILENT") != 0;
-
-  /* Make each `struct dep' point at the
-     `struct file' for the file depended on.  */
+  /* Make each `struct dep' point at the `struct file' for the file
+     depended on.  Also do magic for special targets.  */

  snap_deps ();

@@ -1155,9 +1223,26 @@ decode_switches (argc, argv, env)
  /* Reset getopt's state.  */
  optind = 0;

-  while ((c = getopt_long (argc, argv,
-			   options, long_options, (int *) 0)) != EOF)
+  c = 0;
+  while (optind < argc)
    {
+      if (c == EOF)
+	{
+	  /* There are no more options according to getting getopt, but
+	     there are some arguments left.  Since we have asked for
+	     non-option arguments to be returned in order, I think this
+	     only happens when there is a "--" argument to prevent later
+	     argument from being options.  Since getopt has finished its
+	     job, just update its state variables for the next argument and
+	     set C as if it had returned 1, indicating a non-option
+	     argument.  */
+	  optarg = argv[optind++];
+	  c = 1;
+	}
+      else
+	/* Parse the next argument.  */
+	c = getopt_long (argc, argv, options, long_options, (int *) 0);
+
      if (c == 1)
 	{
 	  /* Non-option argument.  It might be a variable definition.  */
@@ -1301,13 +1386,16 @@ positive integral argument",
  if (!env && (bad || print_usage_flag))
    {
      /* Print a nice usage message.  */
+      FILE *usageto;

      if (print_version_flag)
 	print_version ();

-      fprintf (stderr, "Usage: %s [options] [target] ...\n", program);
+      usageto = bad ? stderr : stdout;

-      fputs ("Options:\n", stderr);
+      fprintf (usageto, "Usage: %s [options] [target] ...\n", program);
+
+      fputs ("Options:\n", usageto);
      for (cs = switches; cs->c != '\0'; ++cs)
 	{
 	  char buf[1024], shortarg[50], longarg[50], *p;
@@ -1378,11 +1466,11 @@ positive integral argument",
 	       line with the description, leaving at least two spaces.
 	       Print it on its own line instead.  */
 	    {
-	      fprintf (stderr, "%s\n", buf);
+	      fprintf (usageto, "%s\n", buf);
 	      buf[0] = '\0';
 	    }

-	  fprintf (stderr, "%*s%s.\n",
+	  fprintf (usageto, "%*s%s.\n",
 		   - DESCRIPTION_COLUMN,
 		   buf, cs->description);
 	}
@@ -1402,7 +1490,7 @@ decode_env_switches (envar, len)
     unsigned int len;
 {
  char *varref = (char *) alloca (2 + len + 2);
-  char *value;
+  char *value, *p;
  int argc;
  char **argv;

@@ -1412,7 +1500,7 @@ decode_env_switches (envar, len)
  bcopy (envar, &varref[2], len);
  varref[2 + len] = ')';
  varref[2 + len + 1] = '\0';
-  value = allocated_variable_expand (varref);
+  value = variable_expand (varref);

  /* Skip whitespace, and check for an empty value.  */
  value = next_token (value);
@@ -1423,12 +1511,34 @@ decode_env_switches (envar, len)
  /* Allocate a vector that is definitely big enough.  */
  argv = (char **) alloca ((1 + len + 1) * sizeof (char *));

+  /* Allocate a buffer to copy the value into while we split it into words
+     and unquote it.  We must use permanent storage for this because
+     decode_switches may store pointers into the passed argument words.  */
+  p = (char *) xmalloc (2 * len);
+
  /* getopt will look at the arguments starting at ARGV[1].
     Prepend a spacer word.  */
  argv[0] = 0;
  argc = 1;
-  while ((argv[argc] = find_next_token (&value, (unsigned int *) 0)) != 0)
-    ++argc;
+  argv[argc] = p;
+  while (*value != '\0')
+    {
+      if (*value == '\\')
+	++value;		/* Skip the backslash.  */
+      else if (isblank (*value))
+	{
+	  /* End of the word.  */
+	  *p++ = '\0';
+	  argv[++argc] = p;
+	  do
+	    ++value;
+	  while (isblank (*value));
+	  continue;
+	}
+      *p++ = *value++;
+    }
+  *p = '\0';
+  argv[++argc] = 0;

  if (argc == 2 && argv[1][0] != '-')
    {
@@ -1463,6 +1573,30 @@ decode_env_switches (envar, len)
  decode_switches (argc, argv, 1);
 }

+/* Quote the string IN so that it will be interpreted as a single word with
+   no magic by the shell; if DOUBLE_DOLLARS is nonzero, also double dollar
+   signs to avoid variable expansion in make itself.  Write the result into
+   OUT, returning the address of the next character to be written.
+   Allocating space for OUT twice the length of IN (thrice if
+   DOUBLE_DOLLARS is nonzero) is always sufficient.  */
+
+static char *
+quote_as_word (out, in, double_dollars)
+     char *out, *in;
+     int double_dollars;
+{
+  while (*in != '\0')
+    {
+      if (index ("^;'\"*?[]$<>(){}|&~`\\ \t\r\n\f\v", *in) != 0)
+	*out++ = '\\';
+      if (double_dollars && *in == '$')
+	*out++ = '$';
+      *out++ = *in++;
+    }
+
+  return out;
+}
+
 /* Define the MAKEFLAGS and MFLAGS variables to reflect the settings of the
   command switches.  Include options with args if ALL is nonzero.
   Don't include options with the `no_makefile' flag set if MAKEFILE.  */
@@ -1471,12 +1605,13 @@ static void
 define_makeflags (all, makefile)
     int all, makefile;
 {
+  static const char ref[] = "$(MAKEOVERRIDES)";
+  static const char posixref[] = "$(-*-command-variables-*-)";
  register const struct command_switch *cs;
  char *flagstring;
  register char *p;
  unsigned int words;
  struct variable *v;
-  struct command_variable *cv;

  /* We will construct a linked list of `struct flag's describing
     all the flags which need to go in MAKEFLAGS.  Then, once we
@@ -1488,7 +1623,6 @@ define_makeflags (all, makefile)
      struct flag *next;
      const struct command_switch *cs;
      char *arg;
-      unsigned int arglen;
    };
  struct flag *flags = 0;
  unsigned int flagslen = 0;
@@ -1497,13 +1631,12 @@ define_makeflags (all, makefile)
    struct flag *new = (struct flag *) alloca (sizeof (struct flag));	      \
    new->cs = cs;							      \
    new->arg = (ARG);							      \
-    new->arglen = (LEN);						      \
    new->next = flags;							      \
    flags = new;							      \
    if (new->arg == 0)							      \
      ++flagslen;		/* Just a single flag letter.  */	      \
    else								      \
-      flagslen += 1 + 1 + 1 + 1 + new->arglen; /* " -x foo" */		      \
+      flagslen += 1 + 1 + 1 + 1 + 3 * (LEN); /* " -x foo" */		      \
    if (!isalnum (cs->c))						      \
      /* This switch has no single-letter version, so we use the long.  */    \
      flagslen += 2 + strlen (cs->long_name);				      \
@@ -1587,23 +1720,9 @@ define_makeflags (all, makefile)
 	  break;
 	}

-#undef	ADD_FLAG
+  flagslen += 4 + sizeof posixref; /* Four more for the possible " -- ".  */

-  if (all && command_variables != 0)
-    {
-      /* Now figure out how much space will be taken up
-	 by the command-line variable definitions.  */
-      flagslen += 4;		/* For the possible " -- ".  */
-      for (cv = command_variables; cv != 0; cv = cv->next)
-	{
-	  v = cv->variable;
-	  flagslen += strlen (v->name);
-	  if (! v->recursive)
-	    ++flagslen;
-	  ++flagslen;
-	  flagslen += strlen (v->value);
-	}
-    }
+#undef	ADD_FLAG

  /* Construct the value in FLAGSTRING.
     We allocate enough space for a preceding dash and trailing null.  */
@@ -1624,16 +1743,15 @@ define_makeflags (all, makefile)
 	*p++ = flags->cs->c;
      if (flags->arg != 0)
 	{
-	  /* A flag that takes an optional argument which in this case
-	     is omitted is specified by ARG being "" and ARGLEN being 0.
-	     We must distinguish because a following flag appended without
-	     an intervening " -" is considered the arg for the first.  */
-	  if (flags->arglen > 0)
+	  /* A flag that takes an optional argument which in this case is
+	     omitted is specified by ARG being "".  We must distinguish
+	     because a following flag appended without an intervening " -"
+	     is considered the arg for the first.  */
+	  if (flags->arg[0] != '\0')
 	    {
 	      /* Add its argument too.  */
 	      *p++ = !isalnum (flags->cs->c) ? '=' : ' ';
-	      bcopy (flags->arg, p, flags->arglen);
-	      p += flags->arglen;
+	      p = quote_as_word (p, flags->arg, 1);
 	    }
 	  ++words;
 	  /* Write a following space and dash, for the next flag.  */
@@ -1653,7 +1771,9 @@ define_makeflags (all, makefile)

  if (all && command_variables != 0)
    {
-      /* Now write all the command-line variable definitions.  */
+      /* Now write a reference to $(MAKEOVERRIDES), which contains all the
+	 command-line variable definitions.  */
+
      if (p == &flagstring[1])
 	/* No flags written, so elide the leading dash already written.  */
 	p = flagstring;
@@ -1670,28 +1790,27 @@ define_makeflags (all, makefile)
 	  *p++ = '-';
 	  *p++ = ' ';
 	}
-      for (cv = command_variables; cv != 0; cv = cv->next)
+
+      /* Copy in the string.  */
+      if (posix_pedantic)
 	{
-	  /* XXX Quoting? */
-	  unsigned int len;
-	  v = cv->variable;
-	  len = strlen (v->name);
-	  bcopy (v->name, p, len);
-	  p += len;
-	  if (! v->recursive)
-	    *p++ = ':';
-	  len = strlen (v->value);
-	  bcopy (v->value, p, len);
-	  p += len;
-	  *p++ = ' ';
-	  ++words;
+	  bcopy (posixref, p, sizeof posixref - 1);
+	  p += sizeof posixref - 1;
 	}
-      --p;			/* Kill the final space.  */
+      else
+	{
+	  bcopy (ref, p, sizeof ref - 1);
+	  p += sizeof ref - 1;
+	}
+    }
+  else if (p == &flagstring[1])
+    {
+      words = 0;
+      --p;
    }
  else if (p[-1] == '-')
    /* Kill the final space and dash.  */
    p -= 2;
-
  /* Terminate the string.  */
  *p = '\0';

@@ -1708,7 +1827,7 @@ define_makeflags (all, makefile)
 			  to redefine its value with the full set of
 			  switches.  Of course, an override or command
 			  definition will still take precedence.  */
-		       o_file, 0);
+		       o_file, 1);
  if (! all)
    /* The first time we are called, set MAKEFLAGS to always be exported.
       We should not do this again on the second call, because that is
@@ -1716,7 +1835,7 @@ define_makeflags (all, makefile)
    v->export = v_export;
  /* Since MFLAGS is not parsed for flags, there is no reason to
     override any makefile redefinition.  */
-  (void) define_variable ("MFLAGS", 6, flagstring, o_env, 0);
+  (void) define_variable ("MFLAGS", 6, flagstring, o_env, 1);
 }

 /* Print version information.  */
--- a/make-stds.texi
+++ b/make-stds.texi
@@ -163,6 +163,11 @@ the file names where they should reside for actual use.  If there is a
 simple test to verify that a program is properly installed, this target
 should run that test.

+If possible, write the @code{install} target rule so that it does not
+modify anything in the directory where the program was built, provided
+@samp{make all} has just been done.  This is convenient for building the
+program under one user name and installing it under another.
+
 The commands should create all the directories in which files are to be
 installed, if they don't already exist.  This includes the directories
 specified as the values of the variables @code{prefix} and
@@ -205,6 +210,9 @@ Delete all the installed files that the @samp{install} target would
 create (but not the noninstalled files such as @samp{make all} would
 create).

+This rule should not modify the directories where compilation is done,
+only the directories where files are installed.
+
@comment The gratuitous blank line here is to make the table look better
@comment in the printed Make manual.  Please leave it in.
@item clean
@@ -327,6 +335,9 @@ installdirs: mkinstalldirs
                                $(libdir) $(infodir) \
                                $(mandir)
@end smallexample
+
+This rule should not modify the directories where compilation is done.
+It should do nothing but create installation directories.
@end table

@node Command Variables
@@ -401,7 +412,9 @@ installed.

 Installation directories should always be named by variables, so it is
 easy to install in a nonstandard place.  The standard names for these
-variables are as follows.
+variables are described below.  They are based on a standard filesystem
+layout; variants of it are used in SVR4, 4.4BSD, Linux, Ultrix v4, and
+other modern operating systems.

 These two variables set the root for the installation.  All the other
 installation directories should be subdirectories of one of these two,
@@ -411,7 +424,8 @@ and nothing should be directly installed into these two directories.
@item prefix
 A prefix used in constructing the default values of the variables listed
 below.  The default value of @code{prefix} should be @file{/usr/local}
-(at least for now).
+When building the complete GNU system, the prefix will be empty and
+@file{/usr} will be a symbolic link to @file{/}.

@item exec_prefix
 A prefix used in constructing the default values of some of the
--- a/make.h
+++ b/make.h
@@ -331,6 +331,7 @@ extern int just_print_flag, silent_flag, ignore_errors_flag, keep_going_flag;
 extern int debug_flag, print_data_base_flag, question_flag, touch_flag;
 extern int env_overrides, no_builtin_rules_flag, print_version_flag;
 extern int print_directory_flag, warn_undefined_variables_flag;
+extern int posix_pedantic;

 extern unsigned int job_slots;
 extern double max_load_average;
--- a/make.texinfo
+++ b/make.texinfo
@@ -8,10 +8,10 @@
@c FSF publishers: format makebook.texi instead of using this file directly.

@set RCSID $Id$
-@set EDITION 0.46
+@set EDITION 0.47
@set VERSION 3.72 Beta
-@set UPDATED 5 July 1994
-@set UPDATE-MONTH July 1994
+@set UPDATED 1 November 1994
+@set UPDATE-MONTH November 1994
@set ISBN 1-882114-50-7

@c finalout
@@ -2141,24 +2141,28 @@ match that file's name.
@findex .IGNORE
@item .IGNORE

-Simply by being mentioned as a target, @code{.IGNORE} says to ignore
-errors in execution of commands.  The dependencies and commands for
-@code{.IGNORE} are not meaningful.
+If you specify dependencies for @code{.IGNORE}, then @code{make} will
+ignore errors in execution of the commands run for those particular
+files.  The commands for @code{.IGNORE} are not meaningful.

-@samp{.IGNORE} exists for historical compatibility.  Since
-@code{.IGNORE} affects every command in the makefile, it is not very
-useful; we recommend you use the more selective ways to ignore errors
-in specific commands.  @xref{Errors, ,Errors in Commands}.
+If mentioned as a target with no dependencies, @code{.IGNORE} says to
+ignore errors in execution of commands for all files.  This usage of
+@samp{.IGNORE} is supported only for historical compatibility.  Since
+this affects every command in the makefile, it is not very useful; we
+recommend you use the more selective ways to ignore errors in specific
+commands.  @xref{Errors, ,Errors in Commands}.

@findex .SILENT
@item .SILENT

-Simply by being mentioned as a target, @code{.SILENT} says not to
-print commands before executing them.  The dependencies and commands
-for @code{.SILENT} are not meaningful.
+If you specify dependencies for @code{.SILENT}, then @code{make} will
+not the print commands to remake those particular files before executing
+them.  The commands for @code{.SILENT} are not meaningful.

-@samp{.SILENT} exists for historical compatibility.  We recommend you
-use the more selective ways to silence specific commands.
+If mentioned as a target with no dependencies, @code{.SILENT} says not
+to print any commands before executing them.  This usage of
+@samp{.SILENT} is supported only for historical compatibility.  We
+recommend you use the more selective ways to silence specific commands.
@xref{Echoing, ,Command Echoing}.  If you want to silence all commands
 for a particular run of @code{make}, use the @samp{-s} or
@w{@samp{--silent}} option (@pxref{Options Summary}).
@@ -2583,7 +2587,7 @@ called @file{@var{name}.d} from a C source file called @file{@var{name}.c}:
@group
 %.d: %.c
        $(SHELL) -ec '$(CC) -M $(CPPFLAGS) $< \
-                      | sed '\''s/$*.o/& $@@/g'\'' > $@@'
+                      | sed '\''s/$*\\.o[ :]*/& $@@/g'\'' > $@@'
@end group
@end example

@@ -2596,6 +2600,12 @@ shell exits with the status of the last command in the pipeline
 status from the compiler.
@cindex @code{-e} (shell flag)

+@cindex @code{-MM} (to GNU compiler)
+With the GNU C compiler, you may wish to use the @samp{-MM} flag instead
+of @samp{-M}.  This omits dependencies on system header files.
+@xref{Preprocessor Options, , Options Controlling the Preprocessor, 
+gcc.info, Using GNU CC}, for details.
+
@cindex @code{sed} (shell command)
 The purpose of the @code{sed} command is to translate (for example):

@@ -2643,11 +2653,13 @@ with no further work from you.  @xref{Remaking Makefiles}.
@cindex rule commands
@cindex writing rule commands

-The commands of a rule consist of shell command lines to be executed one by
-one.  Each command line must start with a tab, except that the first
+The commands of a rule consist of shell command lines to be executed one
+by one.  Each command line must start with a tab, except that the first
 command line may be attached to the target-and-dependencies line with a
 semicolon in between.  Blank lines and lines of just comments may appear
-among the command lines; they are ignored.
+among the command lines; they are ignored.  (But beware, an apparently
+``blank'' line that begins with a tab is @emph{not} blank!  It is an
+empty command; @pxref{Empty Commands}.)

 Users use many different shell programs, but commands in makefiles are
 always interpreted by @file{/bin/sh} unless the makefile specifies
@@ -2713,7 +2725,7 @@ actually doing them.
 The @samp{-s} or @samp{--silent}
 flag to @code{make} prevents all echoing, as if all commands
 started with @samp{@@}.  A rule in the makefile for the special target
-@code{.SILENT} has the same effect 
+@code{.SILENT} without dependencies has the same effect 
 (@pxref{Special Targets, ,Special Built-in Target Names}).
@code{.SILENT} is essentially obsolete since @samp{@@} is more flexible.@refill

@@ -2902,10 +2914,10 @@ This causes @code{rm} to continue even if it is unable to remove a file.
@cindex @code{--ignore-errors}
@findex .IGNORE
 When you run @code{make} with the @samp{-i} or @samp{--ignore-errors}
-flag, errors are ignored in
-all commands of all rules.  A rule in the makefile for the special target
-@code{.IGNORE} has the same effect.  These ways of ignoring errors are
-obsolete because @samp{-} is more flexible.
+flag, errors are ignored in all commands of all rules.  A rule in the
+makefile for the special target @code{.IGNORE} has the same effect, if
+there are no dependencies.  These ways of ignoring errors are obsolete
+because @samp{-} is more flexible.

 When errors are to be ignored, because of either a @samp{-} or the
@samp{-i} flag, @code{make} treats an error return just like success,
@@ -2918,6 +2930,7 @@ can any other that depends on it either directly or indirectly.  No further
 commands will be executed for these targets, since their preconditions
 have not been achieved.

+
@cindex @code{-k}
@cindex @code{--keep-going}
 Normally @code{make} gives up immediately in this circumstance, returning a
@@ -2939,11 +2952,28 @@ is why Emacs' @code{compile} command passes the @samp{-k} flag by
 default.
@cindex Emacs (@code{M-x compile})

+@findex .DELETE_ON_ERROR
+@cindex deletion of target files
+@cindex removal of target files
+@cindex target, deleting on error
+Usually when a command fails, if it has changed the target file at all,
+the file is corrupted and cannot be used---or at least it is not
+completely updated.  Yet the file's timestamp says that it is now up to
+date, so the next time @code{make} runs, it will not try to update that
+file.  The situation is just the same as when the command is killed by a
+signal; @pxref{Interrupts}.  So generally the right thing to do is to
+delete the target file if the command fails after beginning to change
+the file.  @code{make} will do this if @code{.DELETE_ON_ERROR} appears
+as a target.  This is almost always what you want @code{make} to do, but
+it is not historical practice; so for compatibility, you must explicitly
+request it.
+
@node Interrupts, Recursion, Errors, Commands
@section Interrupting or Killing @code{make}
@cindex interrupt
@cindex signal
@cindex deletion of target files
+@cindex removal of target files
@cindex target, deleting on interrupt
@cindex killing (interruption)

@@ -3034,28 +3064,6 @@ is @samp{cd subdir; /bin/make}.  If you use a special version of
 executed for recursive invocations.
@cindex @code{cd} (shell command)

-Also, any arguments that define variable values are added to @code{MAKE},
-so the sub-@code{make} gets them too.  Thus, if you do @samp{make
-CFLAGS=-O}, so that all C compilations will be optimized, the
-sub-@code{make} is run with @samp{cd subdir; /bin/make CFLAGS=-O}.@refill
-
-@vindex MAKE_COMMAND
-@vindex MAKEOVERRIDES
-The @code{MAKE} variable actually just refers to two other variables
-which contain these special values.  In fact, @code{MAKE} is always
-defined as @samp{$(MAKE_COMMAND) $(MAKEOVERRIDES)}.  The variable
-@code{MAKE_COMMAND} is the file name with which @code{make} was invoked
-(such as @file{/bin/make}, above).  The variable @code{MAKEOVERRIDES}
-contains definitions for the variables defined on the command line; in
-the above example, its value is @samp{CFLAGS=-O}.  If you @emph{do not}
-want these variable definitions done in all recursive @code{make}
-invocations, you can redefine the @code{MAKEOVERRIDES} variable to
-remove them.  You do this in any of the normal ways for defining
-variables: in a makefile (@pxref{Setting, ,Setting Variables}); on the command
-line with an argument like @samp{MAKEOVERRIDES=} 
-(@pxref{Overriding, ,Overriding Variables}); or with an environment variable
-(@pxref{Environment, ,Variables from the Environment}).
-
 As a special feature, using the variable @code{MAKE} in the commands of
 a rule alters the effects of the @samp{-t} (@samp{--touch}), @samp{-n}
 (@samp{--just-print}), or @samp{-q} (@w{@samp{--question}}) option.
@@ -3098,9 +3106,9 @@ commands, is propagated to the subsystem.@refill
 Variable values of the top-level @code{make} can be passed to the
 sub-@code{make} through the environment by explicit request.  These
 variables are defined in the sub-@code{make} as defaults, but do not
-override what is specified in the sub-@code{make}'s makefile unless
-you use the @samp{-e} switch
-(@pxref{Options Summary, ,Summary of Options}).@refill
+override what is specified in the makefile used by the sub-@code{make}
+makefile unless you use the @samp{-e} switch (@pxref{Options Summary,
+,Summary of Options}).@refill

 To pass down, or @dfn{export}, a variable, @code{make} adds the variable
 and its value to the environment for running each command.  The
@@ -3118,6 +3126,15 @@ The special variables @code{SHELL} and @code{MAKEFLAGS} are always
 exported (unless you unexport them).
@code{MAKEFILES} is exported if you set it to anything.

+@code{make} automatically passes down variable values that were defined
+on the command line, by putting them in the @code{MAKEFLAGS} variable.
+@iftex
+See the next section.
+@end iftex
+@ifinfo
+@xref{Options/Recursion}.
+@end ifinfo
+
 Variables are @emph{not} normally passed down if they were created by
 default by @code{make} (@pxref{Implicit Variables, ,Variables Used by
 Implicit Rules}).  The sub-@code{make} will define these for
@@ -3266,6 +3283,15 @@ in its environment.  In response, it takes the flags from that value and
 processes them as if they had been given as arguments.
@xref{Options Summary, ,Summary of Options}.

+@cindex command line variable definitions, and recursion
+@cindex variables, command line, and recursion
+@cindex recursion, and command line variable definitions
+Likewise variables defined on the command line are passed to the
+sub-@code{make} through @code{MAKEFLAGS}.  Words in the value of
+@code{MAKEFLAGS} that contain @samp{=}, @code{make} treats as variable
+definitions just as if they appeared on the command line.
+@xref{Overriding, ,Overriding Variables}.
+
@cindex @code{-C}, and recursion
@cindex @code{-f}, and recursion
@cindex @code{-I}, and recursion
@@ -3315,13 +3341,39 @@ subsystem:
        cd subdir; $(MAKE) MAKEFLAGS=
@end example

+@vindex MAKEOVERRIDES
+The command line variable definitions really appear in the variable
+@code{MAKEOVERRIDES}, and @code{MAKEFLAGS} contains a reference to this
+variable.  If you do want to pass flags down normally, but don't want to
+pass down the command line variable definitions, you can reset
+@code{MAKEOVERRIDES} to empty, like this:
+
+@example
+MAKEOVERRIDES =
+@end example
+
+@noindent
+@cindex Arg list too long
+@cindex E2BIG
+This is not usually useful to do.  However, some systems have a small
+fixed limit on the size of the environment, and putting so much
+information in into the value of @code{MAKEFLAGS} can exceed it.
+If you see the error message @samp{Arg list too long}, this may be the problem.
+@findex .POSIX
+@cindex POSIX.2
+(For strict compliance with POSIX.2, changing @code{MAKEOVERRIDES} does
+not affect @code{MAKEFLAGS} if the special target @samp{.POSIX} appears
+in the makefile.  You probably do not care about this.)
+
@vindex MFLAGS
-A similar variable @code{MFLAGS} exists also, for historical compatibility.
-It has the same value as @code{MAKEFLAGS} except that it always begins with
-a hyphen unless it is empty (@code{MAKEFLAGS} begins with a hyphen only when
-it begins with an option that has no single-letter version, such as
-@samp{--warn-undefined-variables}).  @code{MFLAGS} was traditionally used
-explicitly in the recursive @code{make} command, like this:
+A similar variable @code{MFLAGS} exists also, for historical
+compatibility.  It has the same value as @code{MAKEFLAGS} except that it
+does not contain the command line variable definitions, and it always
+begins with a hyphen unless it is empty (@code{MAKEFLAGS} begins with a
+hyphen only when it begins with an option that has no single-letter
+version, such as @samp{--warn-undefined-variables}).  @code{MFLAGS} was
+traditionally used explicitly in the recursive @code{make} command, like
+this:

@example
 subsystem:
@@ -5348,12 +5400,12 @@ variable names because many strange things are valid variable names, but
 are probably not what you intended.  For example,

@smallexample
-files := $(foreach Es escrito en espanol!,b c ch,$(find_files))
+files := $(foreach Esta escrito en espanol!,b c ch,$(find_files))
@end smallexample

@noindent
 might be useful if the value of @code{find_files} references the variable
-whose name is @samp{Es escrito en espanol!} (es un nombre bastante largo,
+whose name is @samp{Esta escrito en espanol!} (es un nombre bastante largo,
 no?), but it is more likely to be a mistake.

@node Origin Function, Shell Function, Foreach Function, Functions
@@ -7110,6 +7162,14 @@ the value of @code{$^} contains just one copy of the name.
@cindex dependencies, list of all
@cindex list of all dependencies

+@vindex $+
+@vindex + @r{(automatic variable)}
+@item $+
+This is like @samp{$^}, but dependencies listed more than once are
+duplicated in the order they were listed in the makefile.  This is
+primarily useful for use in linking commands where it is meaningful to
+repeat library file names in a particular order.
+
@vindex $*
@vindex * @r{(automatic variable)}
@item $*
@@ -7934,8 +7994,9 @@ same time.  @xref{Chained Rules, ,Chains of Implicit Rules}.

@item
 The automatic variable @code{$^} containing a list of all dependencies
-of the current target.  We did not invent this, but we have no idea who did.
-@xref{Automatic, ,Automatic Variables}.
+of the current target.  We did not invent this, but we have no idea who
+did.  @xref{Automatic, ,Automatic Variables}.  The automatic variable
+@code{$+} is a simple extension of @code{$^}.

@item
 The ``what if'' flag (@samp{-W} in GNU @code{make}) was (as far as we know)
@@ -8403,9 +8464,11 @@ For dependencies which are archive members, only
 the member named is used (@pxref{Archives}).

@item $^
+@itemx $+
 The names of all the dependencies, with spaces between them.  For
 dependencies which are archive members, only the member named is used
-(@pxref{Archives}).
+(@pxref{Archives}).  The value of @code{$^} omits duplicate
+dependencies, while @code{$+} retains them and preserves their order.

@item $*
 The stem with which an implicit rule matches 
@@ -8431,6 +8494,10 @@ The directory part and the file-within-directory part of @code{$<}.
@itemx $(^F)
 The directory part and the file-within-directory part of @code{$^}.

+@item $(+D)
+@itemx $(+F)
+The directory part and the file-within-directory part of @code{$+}.
+
@item $(?D)
@itemx $(?F)
 The directory part and the file-within-directory part of @code{$?}.
--- a/remake.c
+++ b/remake.c
@@ -1,5 +1,5 @@
 /* Basic dependency engine for GNU Make.
-Copyright (C) 1988, 89, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
+Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "job.h"
 #include "dep.h"
 #include "file.h"
+#include <assert.h>

 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
@@ -277,9 +278,7 @@ update_file (file, depth)
 	  return 0;

 	default:
-	  error ("internal error: `%s' command_state == %d in update_file",
-		 f->name, (int) f->command_state);
-	  abort ();
+	  assert (f->command_state == cs_running);
 	  break;
 	}
    }
@@ -492,7 +491,16 @@ update_file_1 (file, depth)
      return dep_status;
    }

-  set_command_state (file, cs_not_started);
+  if (file->command_state == cs_deps_running)
+    /* The commands for some deps were running on the last iteration, but
+       they have finished now.  Reset the command_state to not_started to
+       simplify later bookkeeping.  It is important that we do this only
+       when the prior state was cs_deps_running, because that prior state
+       was definitely propagated to FILE's also_make's by set_command_state
+       (called above), but in another state an also_make may have
+       independently changed to finished state, and we would confuse that
+       file's bookkeeping (updated, but not_started is bogus state).  */
+    set_command_state (file, cs_not_started);

  /* Now record which dependencies are more
     recent than this file, so we can define $?.  */
@@ -548,7 +556,6 @@ update_file_1 (file, depth)
  if (!must_make)
    {
      DEBUGPR ("No need to remake target `%s'.\n");
-      file->update_status = 0;
      notice_finished_file (file);
      return 0;
    }
@@ -572,13 +579,9 @@ update_file_1 (file, depth)
    case 0:
      DEBUGPR ("Successfully remade target file `%s'.\n");
      break;
-    case -1:
-      error ("internal error: `%s' update_status is -1 at cs_finished!",
-	     file->name);
-      abort ();
    default:
-      error ("internal error: `%s' update_status invalid!", file->name);
-      abort ();
+      assert (file->update_status == 0 || file->update_status == 1);
+      break;
    }

  file->updated = 1;
@@ -601,12 +604,12 @@ notice_finished_file (file)

  if (touch_flag
      /* The update status will be:
-	 	-1	if no commands were run;
-		0	if some commands (+ or ${MAKE}) were run and won;
+	 	-1	if this target was not remade;
+		0	if 0 or more commands (+ or ${MAKE}) were run and won;
 		1	if some commands were run and lost.
-	 The only time we don't want to touch the target is if
-	 it had some recursive commands, and they lost.  */
-      && file->update_status != 1)
+	 We touch the target if it has commands which either were not run
+	 or won when they ran (i.e. status is 0).  */
+      && file->update_status == 0)
    {
      if (file->cmds != 0 && file->cmds->any_recurse)
 	{
@@ -644,7 +647,7 @@ notice_finished_file (file)
 	f->last_mtime = file->last_mtime;
    }

-  if (file->update_status != -1)
+  if (ran && file->update_status != -1)
    /* We actually tried to update FILE, which has
       updated its also_make's as well (if it worked).
       If it didn't work, it wouldn't work again for them.
@@ -850,6 +853,9 @@ remake_file (file)
 	  execute_file_commands (file);
 	  return;
 	}
+      else
+	/* This tells notice_finished_file it is ok to touch the file.  */
+	file->update_status = 0;
    }

  /* This does the touching under -t.  */
--- a/signame.c
+++ b/signame.c
@@ -20,14 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <signal.h>

 #ifdef HAVE_CONFIG_H
-#if defined (emacs) || defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif

 /* Some systems do not define NSIG in <signal.h>.  */
--- a/variable.c
+++ b/variable.c
@@ -387,12 +387,14 @@ define_automatic_variables ()
  define_variable ("<D", 2, "$(patsubst %/,%,$(dir $<))", o_automatic, 1);
  define_variable ("?D", 2, "$(patsubst %/,%,$(dir $?))", o_automatic, 1);
  define_variable ("^D", 2, "$(patsubst %/,%,$(dir $^))", o_automatic, 1);
+  define_variable ("+D", 2, "$(patsubst %/,%,$(dir $+))", o_automatic, 1);
  define_variable ("@F", 2, "$(notdir $@)", o_automatic, 1);
  define_variable ("%F", 2, "$(notdir $%)", o_automatic, 1);
  define_variable ("*F", 2, "$(notdir $*)", o_automatic, 1);
  define_variable ("<F", 2, "$(notdir $<)", o_automatic, 1);
  define_variable ("?F", 2, "$(notdir $?)", o_automatic, 1);
  define_variable ("^F", 2, "$(notdir $^)", o_automatic, 1);
+  define_variable ("+F", 2, "$(notdir $+)", o_automatic, 1);
 }

 int export_all_variables;
--- a/vpath.c
+++ b/vpath.c
@@ -434,6 +434,8 @@ selective_vpath_search (path, file, mtime_ptr)

 	      return 1;
 	    }
+	  else
+	    exists = 0;
 	}
    }
Author	SHA1	Message	Date
Roland McGrath	016e1beef5	Check for mktemp.	1995-02-05 23:50:12 +00:00
Roland McGrath	21a8ec0d72	(main) [! HAVE_MKTEMP]: Use tmpnam instead of mktemp.	1995-02-05 23:49:40 +00:00
Roland McGrath	fecd9e661a	(make_cv_sysconf_open_max): New check for `sysconf (_SC_OPEN_MAX)'.	1995-02-05 23:45:49 +00:00
Roland McGrath	2914c705e5	Added #undef HAVE_SYSCONF_OPEN_MAX.	1995-02-05 23:36:04 +00:00
Roland McGrath	3f506aaf90	[HAVE_SYSCONF_OPEN_MAX] (getdtablesize): Define as macro using sysconf.	1995-02-05 23:35:39 +00:00
Roland McGrath	75ea6c3ce2	(update_file_1): When !MUST_MAKE, don't set FILE->update_status to zero before calling notice_finished_file. (notice_finished_file): Touch only when FILE->update_status is zero. (remake_file): Set FILE->update_status to zero after not calling execute_file_command and deciding to touch instead.	1995-01-27 09:42:00 +00:00
Roland McGrath	3fb9ebf83f	(debug_signal_handler): New function; toggles debug_flag. (main): Handle SIGUSR1 with that.	1995-01-26 06:29:18 +00:00
Roland McGrath	b4890bdb1c	(realclean): Remove Info files.	1995-01-16 20:46:50 +00:00
Roland McGrath	2cbfa1024a	(variable_expand): Fix braino in last change.	1995-01-15 16:33:35 +00:00
Roland McGrath	258dad0f9a	Fix nits in last change.	1995-01-15 16:32:10 +00:00
Roland McGrath	37358a9a82	(start_job_command): Save and restore environ around vfork call. (search_path): Function #if 0'd out. (exec_command): Use execvp instead of search_path.	1995-01-15 15:57:48 +00:00
Roland McGrath	e167e0a3c2	(variable_expand): Rewrote computed variable name and substitution reference handling to be simpler. First expand the entire text between the parens if it contains any $s, then examine the result of that for subtitution references and do no further expansion while parsing them.	1995-01-15 15:32:37 +00:00
Roland McGrath	7879457545	(construct_command_argv_internal): Handle " quoting too, when no backslash, $ or ` characters appear inside the quotes.	1995-01-15 13:43:48 +00:00
Roland McGrath	d525f4dd72	(union wait check): If WEXITSTATUS and WTERMSIG are defined, just use int.	1995-01-15 13:23:03 +00:00
Roland McGrath	bd19554ea7	(Foreach Function): Correccion de gramatica espanola.	1995-01-13 06:30:39 +00:00
Roland McGrath	fffc384bfc	(default_variables) [__hpux]: Remove special definition of ARFLAGS. Existence of the `f' flag is not consistent across HPUX versions; and one might be using GNU ar anyway.	1995-01-11 00:14:53 +00:00
Roland McGrath	afd1d69e7d	(clean): Don't remove Info files.	1995-01-10 11:30:56 +00:00
Roland McGrath	c1305a1a18	($(bindir)/make): Fix typo in echo.	1995-01-10 11:29:08 +00:00
Roland McGrath	43d5fbfc88	Fix typo in comment.	1995-01-10 11:28:12 +00:00
Roland McGrath	a4642a6a57	(check): Remove gratuitous target declaration.	1995-01-10 11:27:24 +00:00
Roland McGrath	11ca7f1ead	(ETAGS, CTAGS): Don't use -t.	1995-01-07 16:59:15 +00:00
Roland McGrath	4aa992616f	Include config.h first.	1995-01-07 16:57:36 +00:00
Roland McGrath	ab0fb2fa6f	(ar_name_equal) [cray]: Subtract 1 like [__hpux].	1995-01-07 16:55:30 +00:00
Roland McGrath	e1dd3bfa4a	(decode_switches): For --help, print usage to stdout.	1995-01-07 16:38:08 +00:00
Richard M. Stallman	86238ec9d3	install, uninstall, installdirs should not alter the build dir.	1995-01-04 19:37:36 +00:00
Roland McGrath	2e9779fdb4	(update_file_1): Do set_command_state (FILE, cs_not_started) only if old state was deps_running.	1994-12-05 17:42:13 +00:00
Roland McGrath	b61a13463d	(start_waiting_job): Use set_command_state.	1994-11-29 01:10:47 +00:00
Roland McGrath	d3b9c35c8f	(CPPFLAGS): New variable. (prefix, exec_prefix): Set from @...@. (compilation loop): Pass $CPPFLAGS to compiler.	1994-11-28 23:06:28 +00:00
Roland McGrath	c50b75b439	(build.sh.in): Make it executable.	1994-11-28 23:02:42 +00:00
Roland McGrath	7376280c33	(globfiles): Add configure.in, configure.	1994-11-28 22:02:23 +00:00
Roland McGrath	3c767901f6	(make-$(version).tar): Rename install.sh to install-sh.	1994-11-28 20:54:38 +00:00
Roland McGrath	c6dfff5f1b	(prefix, exec_prefix): Set. (CPPFLAGS): Filter out @...@. ($(ARCH)/glob/libglob.a): Don't pass down variables.	1994-11-28 20:51:40 +00:00
Roland McGrath	74540a1e91	Abbreviate copyright years.	1994-11-28 20:50:45 +00:00
Roland McGrath	5159db0aa4	(AC_OUTPUT): Don't write glob/Makefile.	1994-11-28 20:48:43 +00:00
Roland McGrath	e495d2380d	(AC_CHECK_SYMBOL): Use AC_DEFINE_UNQUOTED.	1994-11-28 20:28:26 +00:00
Roland McGrath	1ed34a0118	Don't check for ranlib.	1994-11-28 20:20:43 +00:00
Roland McGrath	e8f64b2c88	(notice_finished_file): Only mark also_make's as updated if really ran cmds.	1994-11-23 03:42:34 +00:00
Roland McGrath	4867409da2	Put dnls before random whitespace.	1994-11-15 11:32:39 +00:00
Roland McGrath	f801fc3521	(CPPFLAGS): New variable, set from @CPPFLAGS@. (RANLIB): Variable removed. (prefix, exec_prefix): Set these from @...@. (.c.o): Use $(CPPFLAGS). (glob/libglob.a): Don't pass down variables to sub-make. glob/Makefile should be configured properly by configure. (distclean): Remove config.log and config.cache (autoconf stuff).	1994-11-13 10:02:19 +00:00
David J. MacKenzie	b2c0446e71	Explain reason for new filesystem layout.	1994-11-11 04:33:24 +00:00
Roland McGrath	8f98ceb724	Add #undef HAVE_UNION_WAIT.	1994-11-08 02:09:49 +00:00
Roland McGrath	dea9990bc8	Converted to Autoconf v2.	1994-11-08 02:08:24 +00:00
Roland McGrath	e4c43aab3e	Test HAVE_DIRENT_H, HAVE_SYS_DIR_H, HAVE_NDIR_H instead of DIRENT, SYSDIR, NDIR.	1994-11-08 00:14:50 +00:00
Roland McGrath	e55ed78080	(prefix, exec_prefix): Set these from @...@. (CPPFLAGS): New variable, set from @CPPFLAGS@. (compiling loop): Pass $CPPFLAGS before $CFLAGS.	1994-11-07 23:42:58 +00:00
Roland McGrath	ca54a0b991	Initial revision	1994-11-07 23:40:44 +00:00
Roland McGrath	e25e2fb7f5	(define_makeflags): When no flags, set WORDS to zero.	1994-11-07 18:57:56 +00:00
Roland McGrath	1a886b6359	(define_makeflags): Terminate properly when FLAGSTRING is empty.	1994-11-06 23:33:55 +00:00
Roland McGrath	b511712f25	(rcs-mark-{alpha,beta}): Let make do the globbing instead of sh.	1994-11-04 21:08:52 +00:00
Roland McGrath	30fcca501f	Remove `DRAFT' from edition.	1994-11-04 20:23:23 +00:00
Roland McGrath	806dc4f7c4	(Variables/Recursion): Fix typo.	1994-11-01 08:40:19 +00:00
Roland McGrath	c0163410d2	(start_job_command): When ARGV is nil, only set update_state and call notice_finished_file if job_next_command returns zero.	1994-11-01 08:34:10 +00:00
Roland McGrath	eac1e9ee66	Doc .DELETE_ON_ERROR. Doc new MAKEFLAGS/MAKEOVERRIDES. Doc .IGNORE/.SILENT with deps.	1994-11-01 08:29:31 +00:00
Roland McGrath	8ad5af7c28	(start_job_command): Call notice_finished_file for empty command line.	1994-11-01 06:18:07 +00:00
Roland McGrath	857d7ad256	(snap_deps): Set COMMANDS_SILENT for .SILENT, not COMMANDS_NOERROR.	1994-10-27 06:02:43 +00:00
Roland McGrath	612a29e0dd	[alliant && i860] (FSCALE): Move defn before #ifndef FSCALE.	1994-10-27 00:34:56 +00:00
Roland McGrath	462304918c	(snap_deps): Set command_flags bits in all :: entries.	1994-10-26 02:49:21 +00:00
Roland McGrath	9d36c92adb	(snap_deps): Fix last change.	1994-10-24 23:44:16 +00:00
Roland McGrath	640c4ecd99	(posix_pedantic): Declare it.	1994-10-24 23:11:57 +00:00
Roland McGrath	07f09cfd88	(main): Move checks .IGNORE, .SILENT, .POSIX to snap_deps.	1994-10-24 22:57:07 +00:00
Roland McGrath	d37c9ba18a	(snap_deps): Check .IGNORE, .SILENT, .POSIX here instead of in main. If .IGNORE has deps, OR COMMANDS_NOERROR into their command_flags and don't set -i. Likewise .SILENT.	1994-10-24 22:56:27 +00:00
Roland McGrath	cc8d6cf343	(start_job_command): In FLAGS initialization, OR in CHILD->file->command_flags.	1994-10-24 22:50:01 +00:00
Roland McGrath	4b17f0982b	(struct file): New member `command_flags'.	1994-10-24 22:47:43 +00:00
Roland McGrath	dc576b2051	(Automatic Dependencies): Improve recommended sed command. Mention -MM flag to gcc.	1994-10-24 05:05:43 +00:00
Roland McGrath	a543a2ae9f	(Commands): Add warning about "blank" line starting with a tab.	1994-10-17 00:02:27 +00:00
Roland McGrath	0e352e4bf7	(switches): Bump flag values for --no-print-directory and --warn-undefined-variables, so neither is 1 (which indicates a nonoption argument).	1994-10-16 05:01:46 +00:00
Roland McGrath	3f8bde0f25	(main): Add missing code in .IGNORE test.	1994-10-16 03:39:35 +00:00
Roland McGrath	4308542cb1	Document $+ and $(+D), $(+F).	1994-10-10 08:10:13 +00:00
Roland McGrath	e622fcf22e	(define_automatic_variables): Define +D and +F.	1994-10-10 08:08:58 +00:00
Roland McGrath	1766b7fa59	(main): Define hidden automatic variable with command vars, and MAKEOVERRIDES to a reference to that. (define_makeflags): If posix_pedantic, write a reference to that instead.	1994-10-01 08:07:35 +00:00
Roland McGrath	fa999783d7	(posix_pedantic): New variable. (main): Set posix_pedantic if .POSIX is a target. Fix .IGNORE and .SILENT hecks to require is_target.	1994-09-30 01:04:54 +00:00
Roland McGrath	e97d6632b5	Comment fix.	1994-09-29 19:52:49 +00:00
Roland McGrath	e3d013a79a	(set_file_variables): Define new automatic variable $+, like $^ but before calling uniquize_deps.	1994-09-29 08:23:25 +00:00
Roland McGrath	9807a2869f	(reap_children): Call delete_child_targets for non-signal error if .DELETE_ON_ERROR is a target.	1994-09-29 04:14:20 +00:00
Roland McGrath	e9521d3447	[alliant && i860] (LOAD_AVE_TYPE, FSCALE, NLIST_STRUCT): Define.	1994-09-28 21:00:06 +00:00
Roland McGrath	c62ca42327	(reap_children): Don't change C->file->command_state when dying. Test it only after calling start_job_command for a new command line. When no more cmds, just set C->file->update_status. (start_job_command): When the last line is empty or under -n, set C->file->update_status. (start_waiting_job): Grok cs_not_started after start_job_command as success. (new_job): Set C->file->update_status when there are no cmds. (job_next_command): When out of lines, don't set CHILD->file->update_status or CHILD->file->command_state.	1994-09-26 23:02:40 +00:00
Roland McGrath	2feb36f620	(quote_as_word): Actually test DOUBLE_DOLLARS, instead of always doubling.	1994-09-26 22:45:08 +00:00
Roland McGrath	f40918e005	(quote_as_word): Renamed from shell_quote. Take new arg; if nonzero, also double $s. (main): Define MAKEOVERRIDES from command_variables here. (define_makeflags): Don't use command_variables here; instead write a reference $(MAKEOVERRIDES) in MAKEFLAGS. Make vars recursive.	1994-09-26 22:37:10 +00:00
Roland McGrath	b13a443fa7	[__MSDOS__]: Fixed typo.	1994-09-26 22:20:56 +00:00
Roland McGrath	e938a511be	(selective_vpath_search): Reset EXISTS when stat fails.	1994-09-26 22:16:51 +00:00
David J. MacKenzie	a96d572aa6	remove CONFIG_BROKETS	1994-09-26 21:57:54 +00:00
David J. MacKenzie	990c39d973	REMOVE CONFIG_BROKETS	1994-09-26 21:56:21 +00:00
David J. MacKenzie	24d37fb493	remove CONFIG_BROKETS	1994-09-26 21:52:40 +00:00
Richard M. Stallman	c1e20276cb	(getloadavg): Add OSF_ALPHA support.	1994-09-17 00:16:57 +00:00
Roland McGrath	9f71eaf6b5	Include <assert.h> and use assert instead of printfs and abort.	1994-09-10 15:04:57 +00:00
Roland McGrath	03cd08cca2	(decode_switches): Loop until optind hits ARGC, not just until getopt_long returns EOF. Initialize C to zero before loop; in loop if C is EOF, set optarg from ARGV[optind++], else call getopt_long. (decode_env_switches): Use variable_expand instead of allocated_variable_expand. Allocate a fresh buffer to copy split words into; scan characters by hand to break words and debackslashify. (shell_quote): New function. (define_makeflags): Allocate doubled space for switch args, and command variable names and values; use shell_quote to quote those things.	1994-09-10 07:01:10 +00:00