GNU make 3.75.92

New glob.h to understand __const
Updated for GNU make 3.75.92.
2026-08-21 01:13:27 +08:00 · 1997-08-27 21:14:44 +00:00 · 1997-08-27 20:43:43 +00:00 · 1997-08-27 20:36:31 +00:00 · 1997-08-27 20:30:54 +00:00 · 1997-08-18 20:14:30 +00:00
68 changed files with 1884 additions and 7319 deletions
--- a/50
+++ b/50
@@ -0,0 +1,50 @@
+-----------------------------------
+
+GNU make development up to version 3.75 by:
+    Roland McGrath <roland@gnu.ai.mit.edu>
+
+
+GNU Make User's Manual written by:
+    Richard M. Stallman <rms@gnu.ai.mit.edu>
+
+  User's Manual edited by:
+    Roland McGrath <roland@gnu.ai.mit.edu>
+    Bob Chassell <bob@gnu.ai.mit.edu>
+    Melissa Weisshaus <melissa@gnu.ai.mit.edu>
+
+
+Development and maintenance starting with GNU make 3.76 by:
+    Paul D. Smith <psmith@gnu.ai.mit.edu>
+
+
+-----------------------------------
+GNU Make porting efforts:
+
+  Port to VMS by:
+      Klaus Kaempf <kkaempf@progis.de>
+      Archive support/Bug fixes by John W. Eaton <jwe@bevo.che.wisc.edu>
+
+  Port to Amiga by:
+      Aaron Digulla <digulla@fh-konstanz.de>
+
+
+  Port to MS-DOS (DJGPP) and MS-Windows 95/NT by:
+      DJ Delorie <dj@delorie.com>
+      Rob Tulloh <rob_tulloh@tivoli.com>
+      Eli Zaretskii <eliz@is.elta.co.il>
+
+-----------------------------------
+Other contributors:
+
+  Janet Carson <janet_carson@tivoli.com>
+  Paul Eggert  <eggert@twinsun.com>
+  Klaus Heinz <kamar@ease.rhein-main.de>
+  Michael Joosten
+  Jim Kelton <jim_kelton@tivoli.com>
+  David Lubbren <uhay@rz.uni-karlsruhe.de>
+  Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+  Carl Staelin (Princeton University)
+  Ian Stewartson (Data Logic Limited)
+
+With suggestions/comments/bug reports from a cast of ... well ...
+hundreds, anyway :)
--- a/160
+++ b/160
@@ -1,3 +1,163 @@
+Wed Aug 27 17:09:32 1997  Paul D. Smith  <psmith@baynetworks.com>
+
+        * Version 3.75.92
+
+Tue Aug 26 11:59:15 1997  Paul D. Smith  <psmith@baynetworks.com>
+	* main.c (print_version): Add 97 to copyright years.
+
+	* read.c (do_define): Check the length of the array before looking
+	at a particular offset.
+
+	* job.c (construct_command_argv_internal): Examine the last byte
+	of the previous arg, not the byte after that.
+
+Sat Aug 23 1997  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Makefile.DOS.template: New file (converted to Makefile.DOS in
+	the distribution).
+
+	* configure.bat: Rewrite to use Makefile.DOS instead of editing
+        Makefile.in.  Add support for building from outside of the source
+        directory.  Fail if the environment block is too small.
+
+	* configh.dos: Use <sys/config.h>.
+
+	* README.DOS: Update instructions.
+
+Fri Aug 22 1997  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* job.c (start_job_command): [__MSDOS__] Don't test for "/bin/sh"
+        literally, use value of unixy_shell instead.
+
+	* filedef.h (NEW_MTIME): Use 1 less than maximum possible value if
+        time_t is unsigned.
+
+Sat Aug 16 00:56:15 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+        * vmsify.c (vmsify, case 11): After translating `..' elements, set
+        nstate to N_OPEN if there are still more elements to process.
+        (vmsify, case 2): After translating `foo/bar' up to the slash,
+        set nstate to N_OPEN, not N_DOT.
+
+Fri Aug  8 15:18:09 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+        * dir.c (vmsstat_dir): Leave name unmodified on exit.
+        * make.h (PATH_SEPARATOR_CHAR): Set to comma for VMS.
+        * vpath.c: Fix comments to refer to path separator, not colon.
+        (selective_vpath_search): Avoid Unixy slash handling for VMS.
+
+Thu Aug  7 22:24:03 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* ar.c: [VMS] Don't declare ar_member_touch.
+	Delete VMS version of ar_member_date.
+	Enable non-VMS versions of ar_member_date and ar_member_date_1 for
+	VMS too.
+	* arscan.c (VMS_get_member_info): New function.
+	(ar_scan): Provide version for VMS systems.
+	(ar_name_equal): Simply compare name and mem on VMS systems.
+	Don't define ar_member_pos or ar_member_touch on VMS systems.
+
+	* config.h-vms (pid_t, uid_t): Don't define.
+
+	* remake.c: Delete declaration of vms_stat.
+	(name_mtime): Don't call vms_stat.
+	(f_mtime): [VMS] Funky time value manipulation no longer necessary.
+
+	* file.c (print_file): [VMS] Use ctime, not cvt_time.
+
+	* make.h: [VMS] Don't define POSIX.
+
+	* makefile.com (filelist): Include ar and arscan.
+	Also include them in the link commands.
+	Don't define NO_ARCHIVES in cc command.
+
+	* makefile.vms (ARCHIVES, ARCHIVES_SRC): Uncomment.
+	(defines): Delete NO_ARCHIVES from list.
+
+	* remake.c (f_mtime): Only check to see if intermediate file is
+	out of date if it also exists (i.e., mtime != (time_t) -1).
+
+	* vmsdir.h (u_long, u_short): Skip typedefs if using DEC C.
+
+Fri Jun 20 23:02:07 1997  Rob Tulloh  <rob_tulloh@tivoli.com>
+
+	* w32/subproc/sub_proc.c: Get W32 sub_proc to handle shebang
+	(#!/bin/sh) in script files correctly.
+	Fixed a couple of memory leaks.
+	Fixed search order in find_file() (w32/subproc/sub_proc.c) so that
+	files with extensions are preferred over files without extensions.
+	Added search for files with .cmd extension too.
+	* w32/subproc/misc.c (arr2envblk): Fixed memory leak.
+
+Mon Aug 18 09:41:08 1997  Paul D. Smith  <psmith@baynetworks.com>
+
+	* Version 3.75.91
+
+Fri Aug 15 13:50:54 1997  Paul D. Smith  <psmith@baynetworks.com>
+
+	* read.c (do_define): Remember to count the newline after the endef.
+
+Thu Aug 14 23:14:37 1997  Paul D. Smith  <psmith@baynetworks.com>
+
+	* many: Rewrote builds to use Automake 1.2.
+
+	* AUTHORS: New file.
+	* maintMakefile: Contains maintainer-only make snippets.
+	* GNUmakefile: This now only runs the initial auto* tools.
+	* COPYING,texinfo.tex,mkinstalldirs,install-sh: Removed (obtained
+	automatically by automake).
+	* compatMakefile: Removed (not needed anymore).
+	* README,build.sh.in: Removed (built from templates).
+	* config.h.in,Makefile.in: Removed (built by tools).
+
+Wed Aug 13 02:22:08 1997  Paul D. Smith  <psmith@baynetworks.com>
+
+	* make.texinfo: Updates for DOS/Windows information (Eli Zaretskii)
+	* README,README.DOS: Ditto.
+
+	* remake.c (update_file_1,f_mtime): Fix GPATH handling.
+	* vpath.c (gpath_search): Ditto.
+
+	* file.c (rename_file): New function: rehash, but also rename to
+	the hashname.
+	* filedef.h: Declare it.
+
+	* variable.c (merge_variable_set_lists): Remove free() of variable
+	set; since various files can share variable sets we don't want to
+	free them here.
+
+Tue Aug 12 10:51:54 1997  Paul D. Smith  <psmith@baynetworks.com>
+
+	* configure.in: Require autoconf 2.12
+
+	* make.texinfo: Replace all "cd subdir; $(MAKE)" examples with a
+	more stylistically correct "cd subdir && $(MAKE)".
+
+	* main.c: Global variable `clock_skew_detected' defined.
+	(main): Print final warning if it's set.
+	* make.h: Declare it.
+	* remake.c (f_mtime): Test and set it.
+
+	* job.c (start_job_command): Add special optimizations for
+ 	"do-nothing" rules, containing just the shell no-op ":".  This is
+ 	useful for timestamp files and can make a real difference if you
+ 	have a lot of them (requested by Fergus Henderson <fjh@cs.mu.oz.au>).
+
+	* configure.in,Makefile.in: Rewrote to use the new autoconf
+	program_transform_name macro.
+
+	* function.c (function_strip): Strip newlines as well as spaces
+	and TABs.
+
+Fri Jun  6 23:41:04 1997  Rob Tulloh <rob_tulloh@tivoli.com>
+
+	* remake.c (f_mtime): Datestamps on FAT-based files are rounded to
+	even seconds when stored, so if the date check fails on WINDOWS32
+	 systems, see if this "off-by-one" error is the problem.
+
+	* General: If your TZ environment variable is not set correctly
+	then all your timestamps will be off by hours.  So, set it!
+
 Mon Apr  7 02:06:22 1997  Paul D. Smith  <psmith@baynetworks.com>

 	* Version 3.75.1
--- a/325
+++ b/325
@@ -1,299 +1,54 @@
-# GNU Make-specific makefile for GNU Make.
-
-# Copyright (C) 1990, 91, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
-# This file is part of GNU Make.
+# This is a maintainer's-only makefile
 #
-# 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.
+# It bootstraps a GNU make maintainer's directory
 #
-# 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.
+
+.SUFFIXES:
+
+NORECURSE = true
+
+# If the user asked for a specific target, invoke the Mkaefile instead.
 #
-# 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.
+.DEFAULT:
+	@[ -f Makefile.in -a -f configure -a -f aclocal.m4 -a -f config.h.in ] \
+	  || $(MAKE) __cfg NORECURSE=
+	@[ -f Makefile ] \
+	  || ./configure
+	$(MAKE) -f Makefile $@

-.PHONY: default
-default:
+.PHONY: __cfg __cfg_basic TAGS

-# Set `ARCH' to a string for the type of machine.
-ifndef ARCH
-ifdef machine
-ARCH = $(machine)
-endif # machine
-endif # not ARCH
+# This is variable since the glob subdirectory doesn't use it.
+#
+ACCONFIG = acconfig.h

-override srcdir := .
-override CC := $(CC)
-
-ifeq ($(ARCH),hp300)
-#customs=yes
-endif
-ifdef customs
-override REMOTE := cstms
-else
-override REMOTE := stub
+__cfg: __cfg_basic config.h.in TAGS
+	cd glob && $(MAKE) -f ../GNUmakefile __cfg_basic ACCONFIG=
+ifdef NORECURSE
+	@echo ""; echo "Now you should run one of:"; echo ""; \
+	  echo "  make all"; \
+	  echo "  make dist"; \
+	  echo "  make distdir"; \
+	  echo "  make distcheck"; echo ""; \
+	  echo "Or similar to proceed.";\
+	  echo ""
 endif

-# Get most of the information from the Unix-compatible makefile.
-include compatMakefile
+__cfg_basic: aclocal.m4 stamp-h.in configure Makefile.in

-MAKE 	= $(MAKE_COMMAND) $(MAKEOVERRIDES)
+aclocal.m4: configure.in
+	aclocal

-CVS	= cvs
+config.h.in: stamp-h.in
+stamp-h.in: configure.in aclocal.m4 $(ACCONFIG)
+	autoheader
+	echo timestamp > $@

-# 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))
-CPPFLAGS := $(filter-out @%@,$(defines) $(CPPFLAGS)) -DHAVE_CONFIG_H
-
-ifdef AC_MACRODIR
-configure config.h.in: $(patsubst %,$(AC_MACRODIR)/%.m4,acspecific acgeneral)
-config.h.in: $(AC_MACRODIR)/acconfig.h
-endif
 configure: configure.in aclocal.m4
-	autoconf $(ACFLAGS)
-	-test -d CVS && $(CVS) commit -m'autoconf $(ACFLAGS)' $@
-config.h.in: configure.in aclocal.m4
-	autoheader $(ACFLAGS)
-	-test -d CVS && $(CVS) commit -m'autoheader $(ACFLAGS)' $@
+	autoconf

-ifdef customs
-defines := $(defines) -Ipmake/customs -Ipmake/lib/include
-LOADLIBES := $(addprefix pmake/customs/,customslib.o rpc.o xlog.o) \
-	     pmake/lib/sprite/libsprite.a
-endif
+Makefile.in: configure.in config.h.in Makefile.am aclocal.m4
+	automake --add-missing

-ifdef ARCH
-
-ifndef no_libc
-libc_dir = /home/gd2/gnu/libc/$(ARCH)
-ifneq ($(wildcard $(libc_dir)),)
-ifneq ($(wildcard $(libc_dir)/works-for-make),)
-#CPPFLAGS := -I$(libc_dir)/include
-#LDFLAGS := -nostdlib $(libc_dir)/lib/start.o
-#LOADLIBES := $(LOADLIBES) \
-#	     $(libc_dir)/lib/mcheck-init.o \
-#	     $(libc_dir)/lib/libc.a \
-#	     -lgcc \
-#	     $(libc_dir)/lib/libc.a
-CC := $(CC) -b glibc
-
-# getopt is in libc.
-GETOPT =
-#GETOPT_SRC = Don't clear this or dist will break.
-
-# glob is in libc too.
-GLOB =
-
-else
-
-endif	 # works-for-make
-endif	 # $(libc_dir)
-endif	 # !no_libc
-
-# We know the type of machine, so put the binaries in subdirectories.
-$(ARCH)/%.o: %.c
-	$(COMPILE.c) -Iglob $< $(OUTPUT_OPTION)
-$(ARCH)/glob/libglob.a: FORCE
-	$(MAKE) -C $(@D) $(@F)
-FORCE:
-objs := $(addprefix $(ARCH)/,$(objs))
-prog := $(ARCH)/make
-
-archpfx = $(ARCH)/
-
-$(archpfx)load.o: load.c
-	$(COMPILE.c) $(LOAD_AVG) $< -o $@
-$(archpfx)load.dep: load.c
-	$(mkdep) $(LOAD_AVG) $< | sed 's,$*\.o,& $@,' > $@
-
-CPPFLAGS := -I$(ARCH) -Iglob -DHAVE_CONFIG_H $(filter-out @%@,$(CPPFLAGS))
-
-ifneq "$(wildcard $(ARCH)/makefile)" ""
-include $(ARCH)/makefile
-endif
-objs := $(objs) $(addprefix $(ARCH)/,$(ALLOCA) $(extras))
-
-else # Not ARCH
-prog := make
-endif
-
-ifneq	"$(findstring gcc,$(CC))" ""
-CFLAGS = -g -Wall -Wtraditional -Wid-clash-31 -Wpointer-arith \
-	    -Wbad-function-cast -Wconversion
-else
-CFLAGS = -g
-endif
-LDFLAGS = -g
-
-# Define the command to make dependencies.
-mkdep-nolib = $(CC) -MM $(CPPFLAGS)
-mkdep = $(CC) -M $(CPPFLAGS)
-
-depfiles = $(patsubst %.o,%.dep,$(filter %.o,$(objs)))
-
-
-.PHONY: default
-default: $(prog)
-
-$(prog): $(objs) $(globdep) #$(addprefix $(ARCH)/,gmalloc.o mcheck.o)
-	$(CC) $(LDFLAGS) $^ $(globlib) $(LOADLIBES) -o $@.new
-	mv -f $@.new $@
-
-libc-srcdir = ../libc
-globfiles = $(addprefix glob/,COPYING.LIB configure.in configure Makefile.in \
-			Makefile.ami SCOPTIONS SMakefile \
-			configure.bat glob.c fnmatch.c glob.h fnmatch.h)
-$(globfiles): stamp-glob ;
-stamp-glob: $(libc-srcdir)/posix/glob.tar
-	-rm -f stamp-glob glob/*
-	tar xvf $< glob
-	$(CVS) commit -m'Updated from libc' glob
-	touch $@
-$(libc-srcdir)/posix/glob.tar: force
-	$(MAKE) -C $(@D) $(@F) no_deps=t
-.PHONY: force
-force:
-
-# Make the Unix-compatible Makefile to be distributed by appending
-# the automatically-generated dependencies to compatMakefile.
-ifeq ($(mkdep),$(mkdep-nolib))
-nolib-deps = $(depfiles)
-else
-%.dep: %.c
-	$(mkdep-nolib) $< | sed -e 's,$*\.o,$(@:.dep=.o) $@,' > $(@:.dep=.dtm)
-	mv -f $(@:.dep=.dtm) $@
-nolib-deps = $(patsubst $(archpfx)%,%,$(depfiles))
-endif
-# The distributed Makefile.in should contain deps for remote-stub only.
-Makefile.in: compatMakefile $(nolib-deps:remote-%.dep=remote-stub.dep)
-	(sed 's/^MAKE[	 ]*=.*$$/@SET_MAKE@/' $<; \
-	 echo '# Automatically generated dependencies.'; \
-	 sed -e 's/ [^ ]*\.dep//' -e 's=$(archpfx)==' $(filter-out $<,$^) \
-	) > $@
-	$(CVS) commit -mRegenerated $@
-
-.SUFFIXES: .dep
-# Maintain the automatically-generated dependencies.
-ifndef	   no_deps
-include $(depfiles)
-endif
-$(archpfx)%.dep: %.c
-	$(mkdep) $< | sed 's,$*\.o,$(@:.dep=.o) $@,' > $@
-
-ETAGS = etags -T # for v19 etags
-
-# Run the tests.
-.PHONY: tests
-testdir := $(shell ls -d1 make-test-?.? | sort -n +0.10 -0.11 +0.12 | tail -1l)
-tests:# $(testdir)/run_make_tests.pl $(prog)
-#	cd $(<D); MAKELEVEL=0 perl $(<F)
-
-build.sh.in: build.template compatMakefile
-	sed -e 's@%objs%@$(filter-out remote-% $(GLOB) $(ALLOCA) $(extras),\
-	       $(patsubst $(archpfx)%,%,$(objs)))\
-	       $(patsubst %.c,%.o,$(filter %.c,$(globfiles)))@' \
-	    $< > $@.new
-	chmod a+x $@.new
-	mv -f $@.new $@
-	$(CVS) commit -mRegenerated $@
-
-# Make the distribution tar files.
-
-.PHONY: dist
-# Figure out the version number from the source of `version.c'.
-version := \
-  $(strip $(shell sed -e '/=/!d' -e 's/^.*"\(.*\)";$$/\1/' < version.c))
-tarfiles := make # make-doc
-tarfiles := $(addsuffix -$(version).tar,$(tarfiles))
-tarfiles := $(tarfiles:%=%.gz) # no more compress $(tarfiles:%=%.Z)
-# Depend on default and doc so we don't ship anything that won't compile.
-dist: cvs-mark default info dvi tests tarfiles
-.PHONY: tarfiles
-tarfiles: $(tarfiles)
-
-vmsfiles = config.h-vms makefile.com makefile.vms readme.vms \
-	   vmsdir.h vmsfunctions.c vmsify.c
-amigafiles = README.Amiga config.ami Makefile.ami SCOPTIONS SMakefile \
-	     amiga.c amiga.h make.lnk
-dosfiles = README.DOS dosbuild.bat
-w32files = README.W32 build_w32.bat config.h.W32 subproc.bat NMakefile \
-	   $(addprefix w32/,pathstuff.c compat/dirent.c include/dirent.h \
-			    include/pathstuff.h include/sub_proc.h \
-			    include/w32err.h subproc/NMakefile \
-			    subproc/build.bat subproc/misc.c \
-			    subproc/proc.h subproc/sub_proc.c \
-			    subproc/w32err.c)
-distfiles=README INSTALL COPYING ChangeLog NEWS \
-          configure Makefile.in configure.in build.sh.in mkinstalldirs \
-	  configh.dos configure.bat \
-	  $(amigafiles) $(vmsfiles) $(w32files) $(dosfiles) \
-	  aclocal.m4 acconfig.h $(srcs) remote-*.c $(globfiles) \
-	  make.texinfo make-stds.texi \
-	  $(wildcard make.?? make.??s make.toc make.aux) make.man texinfo.tex \
-	  TAGS tags install-sh \
-	  make.info make.info*
-
-ifndef dist-flavor
-dist-flavor = alpha
-endif
-.PHONY: cvs-mark
-cvs-mark: $(distfiles)
-	$(CVS) tag -F make-$(subst .,-,$(version))
-
-dist: local-inst
-.PHONY: local-inst
-local-inst: $(prog)
-	install -c -g kmem -o $(USER) -m 2755 $< /usr/local/gnubin/make
-
-# Put the alpha distribution files in the anonymous FTP directory.
-alpha-files = $(tarfiles) GNUmakefile compatMakefile $(testdir).tar.Z
-dist: alpha
-.PHONY: alpha
-alpha-dir := ~ftp/gnu
-alpha-files := $(addprefix $(alpha-dir)/,$(alpha-files))
-alpha: $(alpha-dir) $(alpha-files)
-$(alpha-dir)/%: %
-	@rm -f $@
-	cp $< $@
-
-# Implicit rule to make README and README-doc.
-%: %.template version.c
-	rm -f $@
-	sed 's/VERSION/$(version)/' < $< > $@
-# Make sure I don't edit it by accident.
-	chmod a-w $@
-	$(CVS) commit -m'Regenerated for $(version)' $@
-
-define make-tar
-@rm -fr make-$(version)
-ln -s . make-$(version)
-tar cvhof $@ $(addprefix make-$(version)/,$^)
-rm -f make-$(version)
-endef
-
-%.Z: %; compress -c $< > $@
-%.gz: %; gzip -9 -c -v $< > $@
-
-make-$(version).tar: $(distfiles)
-	$(make-tar)
-
-ifneq (,)
-tests := $(filter-out %~,$(wildcard tests/*))
-make-tests-$(version).tar.Z: $(tests)
-	@rm -fr make-tests-$(version)
-	ln -s tests make-tests-$(version)
-	tar cvhf $(@:.Z=) $(patsubst tests/%,make-tests-$(version)/%,$^)
-	rm -f make-tests-$(version)
-	compress -f $(@:.Z=)
-endif
-
-$(archpfx)loadtest: $(archpfx)load.o
+TAGS:
+	find . -name '*.[ch]' -print | etags -
--- a/Makefile.DOS.template
+++ b/Makefile.DOS.template
@@ -0,0 +1,467 @@
+# -*-Makefile-*- template for DJGPP
+# Makefile.in generated automatically by automake 1.2 from Makefile.am
+
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# This Makefile.DOS is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# -*-Makefile-*-, or close enough
+
+
+SHELL = /bin/sh
+
+srcdir = .
+VPATH = $(srcdir)
+# $DJDIR is defined automatically by DJGPP to point
+# to the root of the DJGPP installation tree.
+prefix = ${DJDIR}
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+datadir = ${prefix}/share
+libdir = ${prefix}/lib
+infodir = ${prefix}/info
+# DJGPP doesn't have separate man tree, use info instead.
+mandir = ${prefix}/info
+includedir = ${prefix}/include
+oldincludedir = c:/djgpp/include
+
+pkgdatadir = $(datadir)/make
+pkglibdir = $(libdir)/make
+pkgincludedir = $(includedir)/make
+
+INSTALL = ${bindir}/ginstall -c
+INSTALL_PROGRAM = ${bindir}/ginstall -c
+INSTALL_DATA = ${bindir}/ginstall -c -m 644
+INSTALL_SCRIPT = ${bindir}/ginstall -c
+transform = s,x,x,
+
+# This will fail even if they don't have a Unix-like shell (stock DOS
+# shell doesn't know about `false').  The only difference is that they
+# get "Error -1" instead of "Error 1".
+EXIT_FAIL = false
+
+NORMAL_INSTALL = true
+PRE_INSTALL = true
+POST_INSTALL = true
+NORMAL_UNINSTALL = true
+PRE_UNINSTALL = true
+POST_UNINSTALL = true
+AR = ar
+CC = gcc
+CPP = gcc -E
+LIBOBJS =
+MAKEINFO = ${bindir}/makeinfo
+PACKAGE = make
+RANLIB = ranlib
+REMOTE = stub
+VERSION = %VERSION%
+
+AUTOMAKE_OPTIONS = 1.2
+
+bin_PROGRAMS =	%PROGRAMS%
+
+make_SOURCES =	%SOURCES%
+# This should include the glob/ prefix
+libglob_a_SOURCES =	%GLOB_SOURCES%
+make_LDADD =	  glob/libglob.a
+
+info_TEXINFOS =	make.texinfo
+
+INCLUDES =	-I$(srcdir)/glob -DLIBDIR=\"c:/djgpp/lib\" -DINCLUDEDIR=\"c:/djgpp/include\"
+
+BUILT_SOURCES =	README build.sh.in
+
+EXTRA_DIST = 	make.man $(BUILT_SOURCES) remote-cstms.c  make-stds.texi texinfo.tex SCOPTIONS SMakefile  Makefile.ami README.Amiga config.ami amiga.c amiga.h  NMakefile README.DOS configh.dos configure.bat makefile.com  README.W32 build_w32.bat config.h.W32 subproc.bat make.lnk  config.h-vms makefile.vms readme.vms vmsdir.h vmsfunctions.c  vmsify.c
+
+SUBDIRS =	glob
+mkinstalldirs = ${bindir}/gmkdir -p
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =  build.sh
+PROGRAMS =  $(bin_PROGRAMS)
+
+
+DEFS =  -I. -I$(srcdir) -I.
+CPPFLAGS = -DHAVE_CONFIG_H
+LDFLAGS =
+LIBS =
+make_OBJECTS =  %OBJECTS%
+make_DEPENDENCIES =    glob/libglob.a
+make_LDFLAGS =
+libglob_a_LIBADD =
+libglob_a_OBJECTS =  %GLOB_OBJECTS%
+noinst_LIBRARIES =	glob/libglob.a
+CFLAGS = -O2 -g
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+TEXI2DVI = texi2dvi
+TEXINFO_TEX = $(srcdir)/texinfo.tex
+INFO_DEPS = make.info
+DVIS = make.dvi
+TEXINFOS = make.texinfo
+DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am  Makefile.in NEWS acconfig.h aclocal.m4 alloca.c build.sh.in config.h.in  configure configure.in getloadavg.c install-sh missing mkinstalldirs  stamp-h.in texinfo.tex
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = gtar
+GZIP = --best
+SOURCES = $(make_SOURCES)
+OBJECTS = $(make_OBJECTS)
+HEADERS = $(wildcard $(srcdir)/*.h)
+
+default: all
+
+.SUFFIXES:
+.SUFFIXES: .c .dvi .info .o .ps .texi .texinfo
+
+distclean-hdr:
+	rm -f config.h
+
+maintainer-clean-hdr:
+
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+	test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do    if test -f $$p; then      echo "  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p | sed '$(transform)'`";       $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p | sed '$(transform)'`;    else :; fi;  done
+
+uninstall-binPROGRAMS:
+	$(NORMAL_UNINSTALL)
+	list='$(bin_PROGRAMS)'; for p in $$list; do    rm -f $(bindir)/`echo $$p|sed '$(transform)'`;  done
+
+.c.o:
+	$(COMPILE) -c $<
+
+clean-noinstLIBRARIES:
+	test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+mostlyclean-compile:
+	rm -f *.o *.exe make.new core
+
+clean-compile:
+
+distclean-compile:
+	rm -f *.tab.c
+
+maintainer-clean-compile:
+
+make: $(make_OBJECTS) $(make_DEPENDENCIES)
+	@command.com /c if exist make del make
+	@command.com /c if exist make.exe del make.exe
+	$(LINK) $(make_LDFLAGS) $(make_OBJECTS) $(make_LDADD) $(LIBS)
+
+make.info: make.texinfo
+make.dvi: make.texinfo
+
+
+DVIPS = dvips
+
+.texi.info:
+	$(MAKEINFO) $(srcdir)/$< -o ./$@
+
+.texi.dvi:
+	TEXINPUTS="$(srcdir);$$TEXINPUTS"    MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.texi:
+	$(MAKEINFO) $(srcdir)/$< -o ./$@
+
+.texinfo.info:
+	$(MAKEINFO) $(srcdir)/$< -o ./$@
+
+.texinfo:
+	$(MAKEINFO) $(srcdir)/$< -o ./$@
+
+.texinfo.dvi:
+	TEXINPUTS="$(srcdir);$$TEXINPUTS"    MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.dvi.ps:
+	$(DVIPS) $< -o $@
+
+install-info-am: $(INFO_DEPS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(infodir)
+	@for file in $(INFO_DEPS) make.i; do    d=$(srcdir);    for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9] $$file[0-9] $$file[0-9][0-9]`; do      if test -f $$d/$$ifile; then        echo " $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile"; $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; else : ; fi;    done;  done
+	@$(POST_INSTALL)
+	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then    for file in $(INFO_DEPS); do      echo " install-info --info-dir=$(infodir) $(infodir)/$$file";     install-info --info-dir=$(infodir) $(infodir)/$$file || :;   done;  else : ; fi
+
+uninstall-info:
+	$(PRE_UNINSTALL)
+	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then    ii=yes;  else ii=; fi;  for file in $(INFO_DEPS); do    test -z $ii || install-info --info-dir=$(infodir) --remove $$file;  done
+	$(NORMAL_UNINSTALL)
+	for file in $(INFO_DEPS) make.i; do    (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9] $$file[0-9] $$file[0-9][0-9]);  done
+
+dist-info: $(INFO_DEPS)
+	for base in $(INFO_DEPS); do    d=$(srcdir);    for file in `cd $$d && eval echo $$base*`; do      test -f $(distdir)/$$file      || ln $$d/$$file $(distdir)/$$file 2> /dev/null      || cp -p $$d/$$file $(distdir)/$$file;    done;  done
+
+mostlyclean-aminfo:
+	rm -f make.aux make.cp make.cps make.dvi make.fn make.fns make.ky    make.log make.pg make.toc make.tp make.tps make.vr make.vrs    make.op make.tr make.cv
+
+clean-aminfo:
+
+distclean-aminfo:
+
+maintainer-clean-aminfo:
+	for i in $(INFO_DEPS) make.i; do rm -f `eval echo $$i*`; done
+
+# Assume that the only thing to do in glob is to build libglob.a,
+# but do a sanity check: if $SUBDIRS will ever have more than
+# a single directory, yell bloody murder.
+all-recursive:
+ifeq ($(words $(SUBDIRS)), 1)
+	@command.com /c if not exist glob\\nul md glob
+	@echo Making all in $(SUBDIRS)
+	$(MAKE) -C $(SUBDIRS) -f ../Makefile INCLUDES='-I$(srcdir) -I$(srcdir)/glob' DEFS='-I.. -I$(srcdir)' VPATH=$(srcdir)/glob libglob.a
+else
+	@echo FATAL: There is more than one directory in "($(SUBDIRS))"
+	@$(EXIT_FAIL)
+endif
+
+$(SUBDIRS):
+	command.com /c md $@
+
+libglob.a: $(libglob_a_OBJECTS)
+	command.com /c if exist libglob.a del libglob.a
+	$(AR) cru libglob.a $(libglob_a_OBJECTS) $(libglob_a_LIBADD)
+	$(RANLIB) libglob.a
+
+mostlyclean-recursive clean-recursive distclean-recursive  maintainer-clean-recursive:
+ifeq ($(words $(SUBDIRS)), 1)
+	@echo Making $(shell echo $@ | sed s/-recursive//) in $(SUBDIRS)
+	$(MAKE) -C $(SUBDIRS) -f ../Makefile $(shell echo $@ | sed s/-recursive//)-am
+else
+	@echo FATAL: There is more than one directory in "($(SUBDIRS))"
+	@$(EXIT_FAIL)
+endif
+
+tags-in-glob: $(libglob_a_SOURCES)
+	etags $(addprefix $(srcdir)/,$^) -o ./glob/TAGS
+
+tags-recursive:
+ifeq ($(words $(SUBDIRS)), 1)
+	$(MAKE) tags-in-glob
+else
+	@echo FATAL: There is more than one directory in "($(SUBDIRS))"
+	@$(EXIT_FAIL)
+endif
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES)
+	mkid $(srcdir)/$(SOURCES) $(srcdir)/$(libglob_a_SOURCES) ./config.h $(HEADERS)
+
+TAGS: tags-recursive $(HEADERS) $(srcdir)/$(SOURCES) config.h $(TAGS_DEPENDENCIES)
+	etags -i ./glob/TAGS $(ETAGS_ARGS) $(srcdir)/$(SOURCES) ./config.h $(HEADERS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	rm -rf $(distdir)
+	GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`;  cd $(distdir)/=build    && ../configure --srcdir=.. --prefix=$$dc_install_base    && $(MAKE)    && $(MAKE) dvi    && $(MAKE) check    && $(MAKE) install    && $(MAKE) installcheck    && $(MAKE) dist
+	rm -rf $(distdir)
+	@echo "========================";  echo "$(distdir).tar.gz is ready for distribution";  echo "========================"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	rm -rf $(distdir)
+distdir: $(DISTFILES)
+	rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 777 $(distdir)
+	@for file in $(DISTFILES); do    d=$(srcdir);    test -f $(distdir)/$$file    || ln $$d/$$file $(distdir)/$$file 2> /dev/null    || cp -p $$d/$$file $(distdir)/$$file;  done
+	for subdir in $(SUBDIRS); do   test -d $(distdir)/$$subdir   || mkdir $(distdir)/$$subdir   || exit 1;   chmod 777 $(distdir)/$$subdir;   (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir)/$$subdir distdir=../$(distdir)/$$subdir distdir)      || exit
+1;  done
+	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
+	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
+alloca.o alloca.lo: alloca.c config.h
+ar.o ar.lo: ar.c make.h config.h filedef.h dep.h glob/fnmatch.h
+arscan.o arscan.lo: arscan.c make.h config.h
+commands.o commands.lo: commands.c make.h config.h dep.h filedef.h  variable.h job.h commands.h
+default.o default.lo: default.c make.h config.h rule.h dep.h filedef.h  job.h commands.h variable.h
+dir.o dir.lo: dir.c make.h config.h glob/glob.h
+expand.o expand.lo: expand.c make.h config.h filedef.h job.h commands.h  variable.h
+file.o file.lo: file.c make.h config.h dep.h filedef.h job.h commands.h  variable.h
+function.o function.lo: function.c make.h config.h filedef.h variable.h  dep.h job.h commands.h
+getloadavg.o getloadavg.lo: getloadavg.c config.h
+getopt.o getopt.lo: getopt.c config.h getopt.h
+getopt1.o getopt1.lo: getopt1.c config.h getopt.h
+implicit.o implicit.lo: implicit.c make.h config.h rule.h dep.h  filedef.h
+job.o job.lo: job.c make.h config.h job.h filedef.h commands.h  variable.h
+main.o main.lo: main.c make.h config.h dep.h filedef.h variable.h job.h  commands.h getopt.h
+misc.o misc.lo: misc.c make.h config.h dep.h
+read.o read.lo: read.c make.h config.h dep.h filedef.h job.h commands.h  variable.h glob/glob.h
+remake.o remake.lo: remake.c make.h config.h filedef.h job.h commands.h  dep.h
+remote-stub.o remote-stub.lo: remote-stub.c make.h config.h filedef.h  job.h commands.h
+rule.o rule.lo: rule.c make.h config.h dep.h filedef.h job.h commands.h  variable.h rule.h
+signame.o signame.lo: signame.c config.h signame.h
+variable.o variable.lo: variable.c make.h config.h dep.h filedef.h job.h  commands.h variable.h
+version.o version.lo: version.c config.h
+vpath.o vpath.lo: vpath.c make.h config.h filedef.h variable.h
+fnmatch.o fnmatch.lo: fnmatch.c fnmatch.h ../config.h
+glob.o glob.lo: glob.c fnmatch.h glob.h ../config.h
+
+info: $(INFO_DEPS) info-recursive
+dvi: $(DVIS) dvi-recursive
+check: all-am
+	$(MAKE) check-recursive check-local
+installcheck: installcheck-recursive
+all-recursive-am: config.h
+	$(MAKE) all-recursive
+
+all-am: Makefile $(INFO_DEPS) $(PROGRAMS) config.h
+
+install-exec-am: install-binPROGRAMS
+
+install-data-am: install-info-am
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info
+
+install-exec: install-exec-recursive install-exec-am
+	@$(NORMAL_INSTALL)
+
+install-data: install-data-recursive install-data-am
+	@$(NORMAL_INSTALL)
+
+install: install-recursive install-exec-am install-data-am
+	@:
+
+uninstall: uninstall-recursive uninstall-am
+
+all: all-recursive-am all-am
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+installdirs: installdirs-recursive
+	$(mkinstalldirs)  $(bindir) $(infodir)
+
+
+mostlyclean-generic:
+	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	rm -f Makefile $(DISTCLEANFILES)
+	rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS  mostlyclean-compile mostlyclean-aminfo mostlyclean-tags  mostlyclean-generic
+
+clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-aminfo  clean-tags clean-generic mostlyclean-am
+
+distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile  distclean-aminfo distclean-tags distclean-generic  clean-am
+
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS  maintainer-clean-compile maintainer-clean-aminfo  maintainer-clean-tags maintainer-clean-generic  distclean-am
+
+mostlyclean:  mostlyclean-recursive mostlyclean-am
+
+clean: clean-noinstLIBRARIES clean-recursive clean-am
+
+distclean:  distclean-recursive distclean-am
+	rm -f config.status
+
+maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f config.status
+
+.PHONY: default mostlyclean-hdr distclean-hdr clean-hdr  maintainer-clean-hdr mostlyclean-binPROGRAMS distclean-binPROGRAMS  clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS  install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile  maintainer-clean-compile install-info-am uninstall-info  mostlyclean-aminfo distclean-aminfo clean-aminfo  maintainer-clean-aminfo install-data-recursive uninstall-data-recursive  install-exec-recursive uninstall-exec-recursive installdirs-recursive  uninstalldirs-recursive all-recursive check-recursive  installcheck-recursive info-recursive dvi-recursive  mostlyclean-recursive distclean-recursive clean-recursive  maintainer-clean-recursive tags tags-recursive mostlyclean-tags  distclean-tags clean-tags maintainer-clean-tags distdir info dvi  check-local installcheck all-recursive-am all-am install-exec-am  install-data-am uninstall-am install-exec install-data install  uninstall all installdirs mostlyclean-generic distclean-generic  clean-generic maintainer-clean-generic clean mostlyclean distclean  maintainer-clean
+
+
+# --------------- Local DIST Section
+
+# Install the w32 subdirectory
+#
+dist-hook:
+	(cd $(srcdir); \
+	 w32=`find w32 -follow \( -name CVS -prune \) -o -type f -print`; \
+	 tar chf - $$w32) \
+	| (cd $(distdir); tar xfBp -)
+
+# --------------- Local CHECK Section
+
+check-local: check-loadavg check-regression
+.PHONY: check-loadavg check-regression
+
+# > check-loadavg
+#
+loadavg: loadavg.c config.h
+	@rm -f loadavg
+	$(LINK) -DTEST $(make_LDFLAGS) loadavg.c $(LIBS)
+# We copy getloadavg.c into a different file rather than compiling it
+# directly because some compilers clobber getloadavg.o in the process.
+loadavg.c: getloadavg.c
+	ln $(srcdir)/getloadavg.c loadavg.c || \
+	cp $(srcdir)/getloadavg.c loadavg.c
+check-loadavg: loadavg
+	@echo The system uptime program believes the load average to be:
+	-uptime
+	@echo The GNU load average checking code believes:
+	-./loadavg
+
+# > check-regression
+#
+# Look for the make test suite, and run it if found.  Look in MAKE_TEST if
+# specified, or else in the srcdir or the distdir, their parents, and _their_
+# parents.
+#
+check-regression:
+	here=`pwd`; testdir=""; \
+	  case "$(MAKE_TEST)" in "") \
+	    for d1 in $$here $(srcdir); do \
+	      for d2 in ../.. .. .; do \
+		all=`echo $$d1/$$d2/make-test-[0-9]*/run_make_tests`; \
+		case "$$all" in \
+		  "$$d1/$$d2/make-test-[0-9]*/run_make_tests") : ;; \
+		  *) try=`for x in $$all; do echo $$x; done | sort | tail -1`;\
+		     testdir=`dirname $$try` ;; esac; \
+            done; done ;; \
+	    *) testdir="$(MAKE_TEST)" ;; \
+	  esac; \
+	  case "$$testdir" in \
+	    "") echo "Couldn't find make-test-* test suite."; exit 0;; \
+	  esac; \
+	  echo "cd $$testdir && ./run_make_tests -make_path $$here/make"; \
+	  cd $$testdir && ./run_make_tests -make_path $$here/make
+
+# --------------- Maintainer's Section
+
+# Note this requires GNU make.  Not to worry, since it will only be included
+# in the Makefile if we're in the maintainer's environment.
+#include $(srcdir)/maintMakefile
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- a/Makefile.am
+++ b/Makefile.am
@@ -0,0 +1,95 @@
+# -*-Makefile-*-, or close enough
+
+AUTOMAKE_OPTIONS = 1.2
+
+bin_PROGRAMS =	make
+
+make_SOURCES =	main.c commands.c job.c dir.c file.c misc.c read.c remake.c \
+		rule.c implicit.c default.c variable.c expand.c function.c \
+		vpath.c version.c ar.c arscan.c remote-$(REMOTE).c \
+		commands.h dep.h filedef.h job.h make.h rule.h variable.h \
+		signame.c signame.h \
+		getopt.c getopt1.c getopt.h
+make_LDADD =	@LIBOBJS@ @ALLOCA@ glob/libglob.a
+
+info_TEXINFOS =	make.texinfo
+
+INCLUDES =	-I$(srcdir)/glob -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\"
+
+BUILT_SOURCES =	README build.sh.in
+
+EXTRA_DIST = 	make.man $(BUILT_SOURCES) remote-cstms.c\
+		make-stds.texi texinfo.tex SCOPTIONS SMakefile\
+		README.Amiga Makefile.ami config.ami make.lnk amiga.c amiga.h\
+		README.DOS Makefile.DOS configure.bat dosbuild.bat configh.dos\
+		README.W32 NMakefile config.h.W32 build_w32.bat subproc.bat\
+		readme.vms makefile.vms makefile.com config.h-vms vmsdir.h\
+		vmsfunctions.c vmsify.c
+
+SUBDIRS =	glob
+
+# --------------- Local DIST Section
+
+# Install the w32 subdirectory
+#
+dist-hook:
+	(cd $(srcdir); \
+	 w32=`find w32 -follow \( -name CVS -prune \) -o -type f -print`; \
+	 tar chf - $$w32) \
+	| (cd $(distdir); tar xfBp -)
+
+
+# --------------- Local CHECK Section
+
+check-local: check-loadavg check-regression
+.PHONY: check-loadavg check-regression
+
+# > check-loadavg
+#
+loadavg: loadavg.c config.h
+	@rm -f loadavg
+	$(LINK) -DTEST $(make_LDFLAGS) loadavg.c $(LIBS)
+# We copy getloadavg.c into a different file rather than compiling it
+# directly because some compilers clobber getloadavg.o in the process.
+loadavg.c: getloadavg.c
+	ln $(srcdir)/getloadavg.c loadavg.c || \
+	cp $(srcdir)/getloadavg.c loadavg.c
+check-loadavg: loadavg
+	@echo The system uptime program believes the load average to be:
+	-uptime
+	@echo The GNU load average checking code believes:
+	-./loadavg
+
+# > check-regression
+#
+# Look for the make test suite, and run it if found.  Look in MAKE_TEST if
+# specified, or else in the srcdir or the distdir, their parents, and _their_
+# parents.
+#
+check-regression:
+	here=`pwd`; testdir=""; \
+	  case "$(MAKE_TEST)" in "") \
+	    for d1 in $$here $(srcdir); do \
+	      for d2 in ../.. .. .; do \
+		all=`echo $$d1/$$d2/make-test-[0-9]*/run_make_tests`; \
+		case "$$all" in \
+		  "$$d1/$$d2/make-test-[0-9]*/run_make_tests") : ;; \
+		  *) try=`for x in $$all; do echo $$x; done | sort | tail -1`;\
+		     testdir=`dirname $$try` ;; esac; \
+            done; done ;; \
+	    *) testdir="$(MAKE_TEST)" ;; \
+	  esac; \
+	  case "$$testdir" in \
+	    "") echo "Couldn't find make-test-* test suite."; exit 0;; \
+	  esac; \
+	  echo "cd $$testdir && ./run_make_tests -make_path $$here/make"; \
+	  cd $$testdir && ./run_make_tests -make_path $$here/make
+
+
+# --------------- Maintainer's Section
+
+if MAINT_MAKEFILE
+# Note this requires GNU make.  Not to worry, since it will only be included
+# in the Makefile if we're in the maintainer's environment.
+include $(srcdir)/maintMakefile
+endif
--- a/Makefile.ami
+++ b/Makefile.ami
@@ -22,11 +22,6 @@
 #	Makefile for GNU Make
 #

-# Ultrix 2.2 make doesn't expand the value of VPATH.
-VPATH = /make-3.74/
-# This must repeat the value, because configure will remove `VPATH = .'.
-srcdir = /make-3.74/
-
 CC = sc
 RM = delete

--- a/Makefile.in
+++ b/Makefile.in
@@ -1,308 +0,0 @@
-# NOTE: If you have no `make' program at all to process this makefile, run
-# `build.sh' instead.
-#
-# Copyright (C) 1988,89,91,92,93,94,95,96 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.
-
-#
-#	Makefile for GNU Make
-#
-
-# Ultrix 2.2 make doesn't expand the value of VPATH.
-VPATH = @srcdir@
-# This must repeat the value, because configure will remove `VPATH = .'.
-srcdir = @srcdir@
-
-CC = @CC@
-
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-
-# Define these for your system as follows:
-#	-DNO_ARCHIVES		To disable `ar' archive support.
-#	-DNO_FLOAT		To avoid using floating-point numbers.
-#	-DENUM_BITFIELDS	If the compiler isn't GCC but groks enum foo:2.
-#				Some compilers apparently accept this
-#				without complaint but produce losing code,
-#				so beware.
-# NeXT 1.0a uses an old version of GCC, which required -D__inline=inline.
-# See also `config.h'.
-defines = @DEFS@ -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\"
-
-# Which flavor of remote job execution support to use.
-# The code is found in `remote-$(REMOTE).c'.
-REMOTE = @REMOTE@
-
-# If your system doesn't have alloca, or the one provided is bad, define this.
-ALLOCA = @ALLOCA@
-ALLOCA_SRC = $(srcdir)/alloca.c
-
-# If your system needs extra libraries loaded in, define them here.
-# System V probably need -lPW for alloca.  HP-UX 7.0's alloca in
-# libPW.a is broken on HP9000s300 and HP9000s400 machines.  Use
-# alloca.c instead on those machines.
-LOADLIBES = @LIBS@
-
-# Any extra object files your system needs.
-extras = @LIBOBJS@
-
-# Common prefix for machine-independent installed files.
-prefix = @prefix@
-# Common prefix for machine-dependent installed files.
-exec_prefix = @exec_prefix@
-
-# Directory to install `make' in.
-bindir = $(exec_prefix)/bin
-# Directory to find libraries in for `-lXXX'.
-libdir = $(exec_prefix)/lib
-# Directory to search by default for included makefiles.
-includedir = $(prefix)/include
-# Directory to install the Info files in.
-infodir = $(prefix)/info
-# Directory to install the man page in.
-mandir = $(prefix)/man/man$(manext)
-# Number to put on the man page filename.
-manext = 1
-# Prefix to put on installed `make' binary file name.
-binprefix =
-# Prefix to put on installed `make' man page file name.
-manprefix = $(binprefix)
-
-# Whether or not make needs to be installed setgid.
-# The value should be either `true' or `false'.
-# On many systems, the getloadavg function (used to implement the `-l'
-# switch) will not work unless make is installed setgid kmem.
-install_setgid = @NEED_SETGID@
-# Install make setgid to this group so it can read /dev/kmem.
-group = @KMEM_GROUP@
-
-# Program to install `make'.
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-# Program to install the man page.
-INSTALL_DATA = @INSTALL_DATA@
-# Generic install program.
-INSTALL = @INSTALL@
-
-# Program to format Texinfo source into Info files.
-MAKEINFO = makeinfo
-# Program to format Texinfo source into DVI files.
-TEXI2DVI = texi2dvi
-
-# Programs to make tags files.
-ETAGS = etags -w
-CTAGS = ctags -w
-
-GLOB = glob/libglob.a
-
-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 remote-$(REMOTE).o	\
-       getopt.o getopt1.o						\
-       $(GLOB) $(ALLOCA) $(extras)
-srcs = $(srcdir)/commands.c $(srcdir)/job.c $(srcdir)/dir.c		\
-       $(srcdir)/file.c $(srcdir)/getloadavg.c $(srcdir)/misc.c		\
-       $(srcdir)/main.c $(srcdir)/read.c $(srcdir)/remake.c		\
-       $(srcdir)/rule.c $(srcdir)/implicit.c $(srcdir)/default.c	\
-       $(srcdir)/variable.c $(srcdir)/expand.c $(srcdir)/function.c	\
-       $(srcdir)/vpath.c $(srcdir)/version.c				\
-       $(srcdir)/remote-$(REMOTE).c					\
-       $(srcdir)/ar.c $(srcdir)/arscan.c				\
-       $(srcdir)/signame.c $(srcdir)/signame.h				\
-       $(srcdir)/getopt.c $(srcdir)/getopt1.c $(srcdir)/getopt.h	\
-       $(srcdir)/commands.h $(srcdir)/dep.h $(srcdir)/filedef.h		\
-       $(srcdir)/job.h $(srcdir)/make.h $(srcdir)/rule.h		\
-       $(srcdir)/variable.h $(ALLOCA_SRC) $(srcdir)/config.h.in
-
-
-.SUFFIXES:
-.SUFFIXES: .o .c .h .ps .dvi .info .texinfo
-
-all: make
-info: make.info
-dvi: make.dvi
-# Some makes apparently use .PHONY as the default goal if it is before `all'.
-.PHONY: all check info dvi
-
-make.info: make.texinfo
-	$(MAKEINFO) -I$(srcdir) $(srcdir)/make.texinfo -o make.info
-
-make.dvi: make.texinfo
-	$(TEXI2DVI) $(srcdir)/make.texinfo
-
-make.ps: make.dvi
-	dvi2ps make.dvi > make.ps
-
-make: $(objs)
-	$(CC) $(LDFLAGS) $(objs) $(LOADLIBES) -o make.new
-	mv -f make.new make
-
-# -I. is needed to find config.h in the build directory.
-.c.o:
-	$(CC) $(defines) -c -I. -I$(srcdir) -I$(srcdir)/glob \
-	      $(CPPFLAGS) $(CFLAGS) $< $(OUTPUT_OPTION)
-
-# For some losing Unix makes.
-SHELL = /bin/sh
-@SET_MAKE@
-
-$(GLOB): FORCE config.h
-	cd glob; $(MAKE) libglob.a
-FORCE:
-
-tagsrcs = $(srcs) $(srcdir)/remote-*.c
-TAGS: $(tagsrcs)
-	$(ETAGS) $(tagsrcs)
-tags: $(tagsrcs)
-	$(CTAGS) $(tagsrcs)
-
-.PHONY: install installdirs
-install: installdirs \
-	 $(bindir)/$(binprefix)make $(infodir)/make.info \
-	 $(mandir)/$(manprefix)make.$(manext)
-
-installdirs:
-	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(mandir)
-
-$(bindir)/$(binprefix)make: make
-	$(INSTALL_PROGRAM) make $@.new
-	@if $(install_setgid); then \
-	   if chgrp $(group) $@.new && chmod g+s $@.new; then \
-	     echo "chgrp $(group) $@.new && chmod g+s $@.new"; \
-	   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 privileges to install $@."; \
-	   fi; \
-	 else true; fi
-# Some systems can't deal with renaming onto a running binary.
-	-rm -f $@.old
-	-mv $@ $@.old
-	mv $@.new $@
-
-$(infodir)/make.info: make.info
-	if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
-	for file in $${dir}/make.info*; do \
-	  name="`basename $$file`"; \
-	  $(INSTALL_DATA) $$file \
-	    `echo $@ | sed "s,make.info\$$,$$name,"`; \
-	done
-# Run install-info only if it exists.
-# Use `if' instead of just prepending `-' to the
-# line so we notice real errors from install-info.
-# We use `$(SHELL) -c' because some shells do not
-# fail gracefully when there is an unknown command.
-	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
-	  install-info --info-dir=$(infodir) $$dir/make.info; \
-	else true; fi
-
-$(mandir)/$(manprefix)make.$(manext): make.man
-	$(INSTALL_DATA) $(srcdir)/make.man $@
-
-
-loadavg: loadavg.c config.h
-	$(CC) $(defines) -DTEST -I. -I$(srcdir) $(CFLAGS) $(LDFLAGS) \
-	      loadavg.c $(LOADLIBES) -o $@
-# We copy getloadavg.c into a different file rather than compiling it
-# directly because some compilers clobber getloadavg.o in the process.
-loadavg.c: getloadavg.c
-	ln $(srcdir)/getloadavg.c loadavg.c || \
-	cp $(srcdir)/getloadavg.c loadavg.c
-check-loadavg: loadavg
-	@echo The system uptime program believes the load average to be:
-	-uptime
-	@echo The GNU load average checking code believes:
-	./loadavg
-check: check-loadavg
-
-
-.PHONY: clean realclean distclean mostlyclean
-clean: glob-clean
-	-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
-glob-clean glob-realclean:
-	cd glob; $(MAKE) $@
-
-Makefile: config.status $(srcdir)/Makefile.in
-	$(SHELL) config.status
-glob/Makefile: config.status $(srcdir)/glob/Makefile.in
-	$(SHELL) config.status
-config.h: stamp-config ;
-stamp-config: config.status $(srcdir)/config.h.in
-	$(SHELL) config.status
-	touch stamp-config
-
-#configure: configure.in aclocal.m4
-#	cd $(srcdir) && autoconf $(ACFLAGS)
-#config.h.in: configure.in aclocal.m4
-#	cd $(srcdir) && autoheader $(ACFLAGS)
-
-# This tells versions [3.59,3.63) of GNU make not to export all variables.
-.NOEXPORT:
-
-# The automatically generated dependencies below may omit config.h
-# because it is included with ``#include <config.h>'' rather than
-# ``#include "config.h"''.  So we add the explicit dependency to make sure.
-$(objs): config.h
-
-# Automatically generated dependencies will be put at the end of the file.
-
-# Automatically generated dependencies.
-commands.o: commands.c make.h signame.h dep.h filedef.h variable.h \
- job.h commands.h
-job.o: job.c make.h signame.h job.h filedef.h commands.h variable.h
-dir.o: dir.c make.h signame.h
-file.o: file.c make.h signame.h dep.h filedef.h job.h commands.h \
- variable.h
-misc.o: misc.c make.h signame.h dep.h
-main.o: main.c make.h signame.h dep.h filedef.h variable.h job.h \
- commands.h getopt.h
-read.o: read.c make.h signame.h dep.h filedef.h job.h commands.h \
- variable.h glob/glob.h
-remake.o: remake.c make.h signame.h filedef.h job.h commands.h dep.h
-rule.o: rule.c make.h signame.h dep.h filedef.h job.h commands.h \
- variable.h rule.h
-implicit.o: implicit.c make.h signame.h rule.h dep.h filedef.h
-default.o: default.c make.h signame.h rule.h dep.h filedef.h job.h \
- commands.h variable.h
-variable.o: variable.c make.h signame.h dep.h filedef.h job.h \
- commands.h variable.h
-expand.o: expand.c make.h signame.h filedef.h job.h commands.h \
- variable.h
-function.o: function.c make.h signame.h filedef.h variable.h dep.h \
- job.h commands.h
-vpath.o: vpath.c make.h signame.h filedef.h variable.h
-version.o: version.c
-ar.o: ar.c make.h signame.h filedef.h dep.h
-arscan.o: arscan.c make.h signame.h
-signame.o: signame.c signame.h
-remote-stub.o: remote-stub.c make.h signame.h filedef.h job.h \
- commands.h
-getopt.o: getopt.c getopt.h
-getopt1.o: getopt1.c getopt.h
-getloadavg.o: getloadavg.c
--- a/10
+++ b/10
@@ -1,6 +1,6 @@
 GNU make NEWS                                               -*-indented-text-*-
  History of user-visible changes.
-  06 Apr 1996
+  18 Aug 1997

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 See the end for copying conditions.
@@ -9,6 +9,9 @@ Please send GNU make bug reports to bug-gnu-utils@prep.ai.mit.edu.

 Version 3.76

+* GNU make now uses automake to control Makefile.in generation.  This
+  should make it more consistent with the GNU standards.
+
 * VPATH functionality has been changed to incorporate the VPATH+ patch,
  previously maintained by Paul Smith <psmith@baynetworks.com>.  See the
  manual.
@@ -21,7 +24,8 @@ Version 3.76
  list of words from number S to number E (inclusive) of TEXT.

 * Instead of an error, detection of future modification times gives a
-  warning and continues.
+  warning and continues.  The warning is repeated just before GNU make
+  exits, so it is less likely to be lost.

 * Fix the $(basename) and $(suffix) functions so they only operate on
  the last filename, not the entire string:
@@ -33,6 +37,8 @@ Version 3.76
    $(suffix a.b)          b                      b
    $(suffix a.b/c)        b/c                    <empty>

+* The $(strip) function now removes newlines as well as TABs and spaces.
+
 * Updates to the Windows 95/NT port from Rob Tulloh (see README.W32).

 * Eli Zaretskii has updated the port to 32-bit protected mode on MSDOS
--- a/NMakefile.template
+++ b/NMakefile.template
@@ -1,7 +1,7 @@
 # NOTE: If you have no `make' program at all to process this makefile, run
 # `build_w32.bat' instead.
 #
-# Copyright (C) 1988, 89, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1988,89,91,92,93,94,95,96,97 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 #
 # GNU Make is free software; you can redistribute it and/or modify
@@ -29,9 +29,9 @@ OUTDIR=.
 MAKEFILE=NMakefile
 SUBPROC_MAKEFILE=NMakefile

-CFLAGS_any = /nologo /MT /W3 /GX /Zi /YX /I . /I glob /I w32/include /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES
+CFLAGS_any = /nologo /MT /W3 /GX /Zi /YX /I . /I glob /I w32/include /D WIN32 /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES
 CFLAGS_debug = $(CFLAGS_any) /Od /D _DEBUG /FR.\WinDebug/ /Fp.\WinDebug/make.pch /Fo.\WinDebug/ /Fd.\WinDebug/make.pdb
-CFLAGS_release = $(CFLAGS_any) /O2 /D NDEBUG /FR.\WinRel/ /Fp.\WinRel/make.pch /Fo.\WinRel/ 
+CFLAGS_release = $(CFLAGS_any) /O2 /D NDEBUG /FR.\WinRel/ /Fp.\WinRel/make.pch /Fo.\WinRel/

 LDFLAGS_debug = w32\subproc\WinDebug\subproc.lib /NOLOGO /SUBSYSTEM:console\
 	/INCREMENTAL:no /PDB:WinDebug/make.pdb /MACHINE:I386 \
@@ -55,13 +55,15 @@ w32/subproc/WinDebug/subproc.lib w32/subproc/WinRel/subproc.lib:
 config.h: config.h.W32
 	copy $? $@

-Release: 
+Release:
 	nmake /f $(MAKEFILE) LDFLAGS="$(LDFLAGS_release)" CFLAGS="$(CFLAGS_release)" OUTDIR=WinRel WinRel/make.exe
-Debug: 
+Debug:
 	nmake /f $(MAKEFILE) LDFLAGS="$(LDFLAGS_debug)" CFLAGS="$(CFLAGS_debug)" OUTDIR=WinDebug WinDebug/make.exe

 clean:
 	rmdir /s /q WinDebug WinRel
+	rmdir /s /q w32\subproc\WinDebug w32\subproc\WinRel
+	erase config.h

 $(OUTDIR):
 	if not exist .\$@\nul mkdir .\$@
--- a/37
+++ b/37
@@ -1,37 +0,0 @@
-This directory contains the 3.75.1 test release of GNU Make.
-All bugs reported for previous test releases have been fixed.
-Some bugs surely remain.
-
-For general building and installation instructions, see the file INSTALL.
-If you need to build GNU Make and have no other `make' program to use,
-you can use the shell script `build.sh' instead.  To do this, first run
-`configure' as described in INSTALL.  Then, instead of typing `make' to
-build the program, type `sh build.sh'.  This should compile the program
-in the current directory.  Then you will have a Make program that you can
-use for `make install', or whatever else.
-
-Some systems' Make programs are broken and cannot process the Makefile for
-GNU Make.  If you get errors from your system's Make when building GNU
-Make, try using `build.sh' instead.
-
-See README.W32 for details about GNU Make on Windows NT or 95.
-See README.Amiga for details about GNU Make on AmigaDOS.
-The MSDOS port of GNU Make is available as part of DJGPP; see the
-WWW page http://www.delorie.com/djgpp/ for more information.
-
-It has been reported that the XLC 1.2 compiler on AIX 3.2 is buggy such
-that if you compile make with `cc -O' on AIX 3.2, it will not work correctly.
-It is said that using `cc' without `-O' does work.
-
-One area that is often a problem in configuration and porting is the code
-to check the system's current load average.  To make it easier to test and
-debug this code, you can do `make check-loadavg' to see if it works
-properly on your system.  (You must run `configure' beforehand, but you
-need not build Make itself to run this test.)
-
-See the file NEWS for what has changed since previous releases.
-
-GNU Make is fully documented in make.texinfo.  See the section entitled
-`Problems and Bugs' for information on submitting bug reports.
-
-GNU Make is free software.  See the file COPYING for copying conditions.
--- a/README.Amiga
+++ b/README.Amiga
@@ -3,7 +3,7 @@ Author: GNU, Amiga port by Aaron "Optimizer" Digulla
 Uploader: Aaron "Optimizer" Digulla (digulla@fh-konstanz.de)
 Type: dev/c

-This is a pure Amiga port of GNU make 3.74. It needs no extra libraries or
+This is a pure Amiga port of GNU make. It needs no extra libraries or
 anything. It has the following features (in addition to any features of
 GNU make):

--- a/README.DOS.template
+++ b/README.DOS.template
@@ -26,6 +26,10 @@ New (since 3.74) DOS-specific features:

   8. Can be built without (a previous version of) Make.

+   9. The build process requires only standard tools.  (Optional
+      targets like "install:" and "clean:" still need additional
+      programs, though, see below.)
+

 To build:

@@ -35,30 +39,61 @@ To build:

   2. Invoke the `configure.bat' batch file.

-      If it doesn't find a working Make, it will suggest to use the
-      `dosbuild.bat' batch file to build Make.  Either do as it
-      suggests or install another Make program (a pre-compiled binary
-      should be available from the usual DJGPP sites).
+      If you are building Make in-place, i.e. in the same directory
+      where its sources are kept, just type "configure.bat" and press
+      [Enter].  Otherwise, you need to supply the path to the source
+      directory as an argument to the batch file, like this:

-   3. If you have Make, the configure script will need a Unix-style
-      Sed program.  If you don't have that installed, you can find one
-      on one of the DJGPP mirror sites.
+		configure.bat c:/djgpp/gnu/make-3.76
+
+      Note the forward slashes: you MUST use them here.
+
+   3. If configure.bat doesn't find a working Make, it will suggest to
+      use the `dosbuild.bat' batch file to build Make.  Either do as it
+      suggests or install another Make program (a pre-compiled binary
+      should be available from the usual DJGPP sites) and rerun
+      configure.bat.

   4. If you will need to run Make on machines without an FPU, you
      might consider building a version of Make which doesn't issue
      floating-point instructions (they don't help much on MSDOS
-      anyway).  To this end, invoke the configure batch file like so:
-
-			configure no-float
+      anyway).  To this end, edit the Makefile created by
+      configure.bat and add -DNO_FLOAT to the value of CPPFLAGS.

   5. Invoke Make.

-   6. If you have a Unix-style shell installed, you can use the
-      `install' target.  You will also need GNU Fileutils and GNU
-      Sh-utils for this (they should be available from the DJGPP
-      sites).
+      If you are building from outside of the source directory, you
+      need to tell Make where the sources are, like this:

-   7. The `clean' targets require Unix-style `rm' program.
+	        make srcdir=c:/djgpp/gnu/make-3.76
+
+      (configure.bat will tell you this when it finishes).  You MUST
+      use a full, not relative, name of the source directory here, or
+      else Make might fail.
+
+   6. After Make finishes, if you have a Unix-style shell installed,
+      you can use the `install' target to install the package.  You
+      will also need GNU Fileutils and GNU Sh-utils for this (they
+      should be available from the DJGPP sites).
+
+      Without a Unix-style shell, you will have to install programs
+      and the docs manually.  Copy make.exe to a directory on your
+      PATH, make.i* info files to your Info directory, and update the
+      file `dir' in your Info directory by adding the following item
+      to the main menu:
+
+	* GNU make: (make.info).           The GNU make utility.
+
+      If you have the `install-info' program (from the GNU Texinfo
+      package), it will do that for you if you invoke it like this:
+
+	install-info --info-dir=c:/djgpp/info c:/djgpp/info/make.info
+
+      (If your Info directory is other than C:\DJGPP\INFO, change this
+      command accordingly.)
+
+   7. The `clean' targets also require Unix-style shell and `test' and
+      `rm' programs (from Fileutils and Sh-utils, accordingly). 



@@ -67,7 +102,8 @@ Notes:

   1. The shell issue.

-      This is probably the most significant improvement in this port.
+      This is probably the most significant improvement, first
+      introduced in the port of GNU Make 3.75.

      The original behavior of GNU Make is to invoke commands
      directly, as long as they don't include characters special to
@@ -75,10 +111,10 @@ Notes:
      When shell features like redirection or filename wildcards are
      involved, Make calls the shell.

-      This port supports both DOS shells (the stock COMMAND.COM and
-      its 4DOS/NDOS replacements), and Unix-style shells (tested with
-      the venerable Stewartson's `ms_sh' 2.3 and the recent DJGPP port
-      of `bash' by Daisuke Aoyama <jack@st.rim.or.jp>).
+      This port supports both DOS shells (the stock COMMAND.COM and its
+      4DOS/NDOS replacements), and Unix-style shells (tested with the
+      venerable Stewartson's `ms_sh' 2.3 and the DJGPP port of `bash' by
+      Daisuke Aoyama <jack@st.rim.or.jp>).

      When the $SHELL variable points to a Unix-style shell, Make
      works just like you'd expect on Unix, calling the shell for any
@@ -204,8 +240,8 @@ Notes:
      doesn't include characters illegal on MSDOS FAT filesystems,
      will be automatically down-cased.)  User reports that I have
      indicate that this default behavior is generally what you'd
-      expect; however, since this is the first DJGPP port of Make that
-      supports long filenames, your input is most welcome.
+      expect; however, since support for long filenames in the DJGPP
+      port of GNU Make is relatively new, your input is most welcome.

      In any case, if you hit a situation where you must force Make to
      get the 8+3 DOS filenames in upper case, set FNCASE=y in the
@@ -218,7 +254,7 @@ Notes:
      make implicit assumptions about the pathname syntax.  In
      particular, the directories are assumed to be separated by `/',
      and any pathname which doesn't begin with a `/' is assumed to be
-      releative to the current directory.  This port attempts to
+      relative to the current directory.  This port attempts to
      support DOS-style pathnames which might include the drive letter
      and use backslashes instead of forward slashes.  However, this
      support is not complete; I feel that pursuing this support too
--- a/README.template
+++ b/README.template
@@ -1,4 +1,4 @@
-This directory contains the VERSION test release of GNU Make.
+This directory contains the %VERSION% test release of GNU Make.
 All bugs reported for previous test releases have been fixed.
 Some bugs surely remain.

@@ -14,10 +14,16 @@ Some systems' Make programs are broken and cannot process the Makefile for
 GNU Make.  If you get errors from your system's Make when building GNU
 Make, try using `build.sh' instead.

-See README.W32 for details about GNU Make on Windows NT or 95.
-See README.Amiga for details about GNU Make on AmigaDOS.
-The MSDOS port of GNU Make is available as part of DJGPP; see the
-WWW page http://www.delorie.com/djgpp/ for more information.
+  - See README.W32 for details about GNU Make on Windows NT or 95.
+
+  - See README.Amiga for details about GNU Make on AmigaDOS.
+
+  - See README.DOS for compilation instructions on MS-DOS and MS-Windows
+    using DJGPP tools.
+
+    A precompiled binary of the MSDOS port of GNU Make is available as part
+    of DJGPP; see the WWW page http://www.delorie.com/djgpp/ for more
+    information.

 It has been reported that the XLC 1.2 compiler on AIX 3.2 is buggy such
 that if you compile make with `cc -O' on AIX 3.2, it will not work correctly.
--- a/TODO.private
+++ b/TODO.private
@@ -0,0 +1,51 @@
+                                                            -*-Indented-Text-*-
+GNU Make TODO List
+------------------
+
+This list comes both from the authors and from users of GNU make.
+
+They are listed in no particular order!
+
+Also, I don't gaurantee that all of them will be ultimately deemed "good
+ideas" and implemented.  These are just the ones that, at first blush,
+seem to have some merit (and that I can remember).
+
+However, if you see something here you really, really want, speak up.
+All other things being equal, I will tend to implement things that seem
+to maximize user satisfaction.
+
+Also, this list doesn't include things which I'm pretty sure would
+require serious, fundamental change to GNU make; those things belong on
+the mythical "Make 4.0" list.  I admit, that line can be somewhat fuzzy :)
+
+
+  * Per-target variable definitions (a la SunOS make's ":=" feature, but
+    note the syntax here will definitely be different!)
+
+  * Multi-token pattern rule matching (allow %1/%2.c : %1/obj/%2.o, etc.)
+
+  * More robust clock skew detection algorithm.
+
+  * Provide MAKETARGETS and MAKEVARIABLES variables, containing the
+    names of the targets and variables defined in the makefile.
+
+  * If the user asks for parallelization, rebuild any "include"'d files
+    in parallel as well (helps esp. when there are many .d files to be
+    built).
+
+  * Allow variables/functions to expand to other make rules which are
+    then interpreted, with newlines handled correctly.
+
+  * More intelligent submake handling when doing parallel makes:
+    currently each submake gets a "-j 1" option.  It would be good if
+    make was smart enough to give some/all its slots to the submake
+    (esp. if there is no other rule that can be run by the parent in
+    parallel, a common situation).  Doing this perfectly might be too
+    hard, but something less than perfect is certainly possible.
+
+  * Option to check more than timestamps to determine if targets have
+    changed (MD5 checksumming?)
+
+  * Some sort of operating-system independent way of handling paths
+    would be outstanding, so makefiles can be written for UNIX, VMS,
+    DOS, MS-Windows, Amiga, etc. with a minimum of specialization.
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,3 +1,9 @@
+/* Name of this package (needed by automake) */
+#undef PACKAGE
+
+/* Version of this package (needed by automake) */
+#undef VERSION
+
 /* Define to the name of the SCCS `get' command.  */
 #undef SCCS_GET

--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,19 +0,0 @@
-dnl
-dnl Check for a symbol
-dnl
-AC_DEFUN(AC_CHECK_SYMBOL, [dnl
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(ac_cv_check_symbol_$1, [dnl
-AC_TRY_LINK(, 
-changequote(,)dnl
-extern char *$1[]; puts(*$1);,
-changequote([,])dnl
-	    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
--- a/ar.c
+++ b/ar.c
@@ -1,5 +1,5 @@
 /* Interface to `ar' archives for GNU Make.
-Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+Copyright (C) 1988,89,90,91,92,93,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -26,9 +26,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */

 /* Defined in arscan.c.  */
 extern long int ar_scan PARAMS ((char *archive, long int (*function) (), long int arg));
-extern int ar_member_touch PARAMS ((char *arname, char *memname));
 extern int ar_name_equal PARAMS ((char *name, char *mem, int truncated));
-
+#ifndef VMS
+extern int ar_member_touch PARAMS ((char *arname, char *memname));
+#endif

 /* Return nonzero if NAME is an archive-member reference, zero if not.
   An archive-member reference is a name like `lib(member)'.
@@ -40,7 +41,7 @@ ar_name (name)
     char *name;
 {
  char *p = index (name, '('), *end = name + strlen (name) - 1;
-  
+
  if (p == 0 || p == name || *end != ')')
    return 0;

@@ -66,111 +67,7 @@ ar_parse_name (name, arname_p, memname_p)

  if (memname_p != 0)
    *memname_p = savestring (p + 1, end - (p + 1));
-}  
- 
-#ifdef VMS
-#include <lbrdef.h>
-#include <mhddef.h>
-#include <credef.h>
-#include <descrip.h>
-#include <ctype.h>
-#if __DECC
-#include <lbr$routines.h>
-#endif
-
-#define uppercasify(str) {char *str1; for (str1 = str; *str1; str1++) *str1 = _toupper(*str1);}
-
-#define LBR$_KEYNOTFND 2527330 /* This isn't in any .h file anywhere so I got it from a MACRO library */
-
-time_t
-ar_member_date (name)
-     char *name;
-{
-  static char *arname;
-  static char *memname;
-  char *p,*q;
-  long int val;
-  static struct {
-    struct mhddef mhd;
-    struct credef cre;
-    char garbage[256];
-  } buf;
-  int func=LBR$C_READ,
-      type=LBR$C_TYP_OBJ,
-      rfa[2],
-      lidx,
-      status;
-  $DESCRIPTOR(bufdesc,(char *)&buf);
-  $DESCRIPTOR(libdesc,arname);
-  $DESCRIPTOR(moddesc,memname);
-
-  /* This "file" is an archive member.  */
-  p = index (name, '(');
-  arname = savestring (name, p - name);
-  val = strlen (p) - 2;
-/*
-  if (val > 15)
-    val = 15;
-*/
-  memname = savestring (p + 1, val);
-#ifdef OLDWAY
-  p = rindex (memname, ')');
-  if (p != 0) {
-      q = rindex(p,'.');
-      if (q)
-	*q = '\0'; /* to get rid of extension */
-  }
-#endif
-
-  q = rindex(memname,'.');
-  if (q)
-    *q = '\0'; /* to get rid of extension */
-
-  uppercasify(memname);
-
-  /* Make sure we know the modtime of the archive itself because
-     we are likely to be called just before commands to remake a
-     member are run, and they will change the archive itself.  */
-  (void) f_mtime (enter_file (arname));
-
-  libdesc.dsc$a_pointer = arname;
-  libdesc.dsc$w_length = strlen(arname);
-  moddesc.dsc$a_pointer = memname;
-  moddesc.dsc$w_length = strlen(memname);
-
-  if (!((status = lbr$ini_control(&lidx,&func,&type,0)) & 1)) {
-    printf("Error in lbr$ini_control, %d\n",status);
-    return(-1);
-  }
-
-  if (!((status = lbr$open(&lidx,&libdesc,0,0,0,0,0)) & 1)) {
-    printf("Error opening library %s to lookup member %s, %d\n",arname, memname ,status);
-    return(-1);
-  }
-
-  if (!((status = lbr$lookup_key(&lidx,&moddesc,rfa)) & 1)) {
-      if (status != LBR$_KEYNOTFND)
-	printf("Error looking up module %s in library %s, %d\n",memname, arname ,status);
-      lbr$close(&lidx);
-      return(-1);
-  }
-
-  if (!((status = lbr$set_module(&lidx,rfa,&bufdesc,&bufdesc,0)) & 1)) {
-    printf("Error getting module info, %d\n",status);
-    lbr$close(&lidx);
-    return(-1);
-  }
-
-  lbr$close(&lidx);
-
-  val = SHELL$FIX_TIME(&buf.mhd.mhd$l_datim);
-
-  free (arname);
-  free (memname);
-  return (val <= 0 ? (time_t) -1 : (time_t) val);
 }
-
-#else

 static long int ar_member_date_1 PARAMS ((int desc, char *mem, int truncated, long int hdrpos,
 	long int datapos, long int size, long int date, int uid, int gid, int mode, char *name));
@@ -232,13 +129,12 @@ ar_member_date_1 (desc, mem, truncated,
 {
  return ar_name_equal (name, mem, truncated) ? date : 0;
 }
-#endif /* !VMS */

 /* Set the archive-member NAME's modtime to now.  */

 #ifdef VMS
 int
-ar_touch (name)  
+ar_touch (name)
     char *name;
 {
  error ("touch archive member is not available on VMS");
--- a/arscan.c
+++ b/arscan.c
@@ -1,19 +1,19 @@
 /* Library function for scanning an archive file.
-   Copyright (C) 1987, 89, 91, 92, 93, 94, 95 Free Software Foundation, Inc.
+Copyright (C) 1987,89,91,92,93,94,95,97 Free Software Foundation, Inc.

-   This program 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.
+This program 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.

-   This program 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.
+This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */

 #include "make.h"

@@ -25,6 +25,171 @@

 #ifndef	NO_ARCHIVES

+#ifdef VMS
+#include <lbrdef.h>
+#include <mhddef.h>
+#include <credef.h>
+#include <descrip.h>
+#include <ctype.h>
+#if __DECC
+#include <unixlib.h>
+#include <lbr$routines.h>
+#endif
+
+#define uppercasify(str) {char *str1; for (str1 = str; *str1; str1++) *str1 = _toupper(*str1);}
+
+static void *VMS_lib_idx;
+
+static char *VMS_saved_memname;
+
+static time_t VMS_member_date;
+
+static long int (*VMS_function) ();
+
+static int
+VMS_get_member_info (module, rfa)
+     struct dsc$descriptor_s *module;
+     unsigned long *rfa;
+{
+  int status, i;
+  long int fnval;
+
+  time_t val;
+
+  static struct dsc$descriptor_s bufdesc =
+    { 0, DSC$K_DTYPE_T, DSC$K_CLASS_S, NULL };
+
+  struct mhddef *mhd;
+  char filename[128];
+
+  bufdesc.dsc$a_pointer = filename;
+  bufdesc.dsc$w_length = sizeof (filename);
+
+  status = lbr$set_module (&VMS_lib_idx, rfa, &bufdesc,
+			   &bufdesc.dsc$w_length, 0);
+  if (! status)
+    {
+      error ("lbr$set_module failed to extract module info, status = %d",
+	     status);
+
+      lbr$close (&VMS_lib_idx);
+
+      return 0;
+    }
+
+  mhd = (struct mhddef *) filename;
+
+  val = decc$fix_time (&mhd->mhd$l_datim);
+
+  for (i = 0; i < module->dsc$w_length; i++)
+    filename[i] = _tolower (module->dsc$a_pointer[i]);
+
+  filename[i] = '\0';
+
+  VMS_member_date = (time_t) -1;
+
+  fnval =
+    (*VMS_function) (-1, filename, 0, 0, 0, 0, val, 0, 0, 0,
+		     VMS_saved_memname);
+
+  if (fnval)
+    {
+      VMS_member_date = fnval;
+      return 0;
+    }
+  else
+    return 1;
+}
+
+/* Takes three arguments ARCHIVE, FUNCTION and ARG.
+
+   Open the archive named ARCHIVE, find its members one by one,
+   and for each one call FUNCTION with the following arguments:
+     archive file descriptor for reading the data,
+     member name,
+     member name might be truncated flag,
+     member header position in file,
+     member data position in file,
+     member data size,
+     member date,
+     member uid,
+     member gid,
+     member protection mode,
+     ARG.
+
+   NOTE: on VMS systems, only name, date, and arg are meaningful!
+
+   The descriptor is poised to read the data of the member
+   when FUNCTION is called.  It does not matter how much
+   data FUNCTION reads.
+
+   If FUNCTION returns nonzero, we immediately return
+   what FUNCTION returned.
+
+   Returns -1 if archive does not exist,
+   Returns -2 if archive has invalid format.
+   Returns 0 if have scanned successfully.  */
+
+long int
+ar_scan (archive, function, arg)
+     char *archive;
+     long int (*function) ();
+     long int arg;
+{
+  char *p;
+
+  static struct dsc$descriptor_s libdesc =
+    { 0, DSC$K_DTYPE_T, DSC$K_CLASS_S, NULL };
+
+  unsigned long func = LBR$C_READ;
+  unsigned long type = LBR$C_TYP_UNK;
+  unsigned long index = 1;
+
+  int status;
+
+  status = lbr$ini_control (&VMS_lib_idx, &func, &type, 0);
+
+  if (! status)
+    {
+      error ("lbr$ini_control failed with status = %d",status);
+      return -2;
+    }
+
+  libdesc.dsc$a_pointer = archive;
+  libdesc.dsc$w_length = strlen (archive);
+
+  status = lbr$open (&VMS_lib_idx, &libdesc, 0, 0, 0, 0, 0);
+
+  if (! status)
+    {
+      error ("unable to open library `%s' to lookup member `%s'",
+	     archive, (char *)arg);
+      return -1;
+    }
+
+  VMS_saved_memname = (char *)arg;
+
+  /* For comparison, delete .obj from arg name.  */
+
+  p = rindex (VMS_saved_memname, '.');
+  if (p)
+    *p = '\0';
+
+  VMS_function = function;
+
+  lbr$get_index (&VMS_lib_idx, &index, VMS_get_member_info, 0);
+
+  /* Undo the damage.  */
+  if (p)
+    *p = '.';
+
+  lbr$close (&VMS_lib_idx);
+
+  return VMS_member_date > 0 ? VMS_member_date : 0;
+}
+
+#else /* !VMS */
+
 /* SCO Unix's compiler defines both of these.  */
 #ifdef	M_UNIX
 #undef	M_XENIX
@@ -203,7 +368,7 @@ ar_scan (archive, function, arg)
 	    (void) close (desc);
 	    return -2;
 	  }
-	
+
 	name[name_len] = 0;

 	sscanf (member_header.ar_date, "%12ld", &dateval);
@@ -277,7 +442,7 @@ ar_scan (archive, function, arg)
 		   && name[2] == '/')
 	    {
 	      int namesize = atoi (name + 3);
- 
+
 	      name = (char *) alloca (namesize + 1);
 	      nread = read (desc, name, namesize);
 	      if (nread != namesize)
@@ -351,7 +516,7 @@ ar_scan (archive, function, arg)
 		(void) close (desc);
 		return -2;
 	      }
- 
+
 	    /* The names are separated by newlines.  Some formats have
 	       a trailing slash.  Null terminate the strings for
 	       convenience.  */
@@ -365,7 +530,7 @@ ar_scan (archive, function, arg)
 		      clear[-1] = '\0';
 		  }
 	      }
- 
+
 	    is_namemap = 0;
 	  }

@@ -379,6 +544,7 @@ ar_scan (archive, function, arg)
  close (desc);
  return 0;
 }
+#endif /* !VMS */

 /* Return nonzero iff NAME matches MEM.
   If TRUNCATED is nonzero, MEM may be truncated to
@@ -426,7 +592,7 @@ ar_name_equal (name, mem, truncated)
  }

 #else	/* AIX or APOLLO.  */
-
+#ifndef VMS
  if (truncated)
    {
 #ifdef AIAMAG
@@ -435,7 +601,7 @@ ar_name_equal (name, mem, truncated)
 #else
      struct ar_hdr hdr;
      return !strncmp (name, mem,
-		       sizeof (hdr.ar_name) - 
+		       sizeof (hdr.ar_name) -
 #if !defined (__hpux) && !defined (cray)
 		       1
 #else
@@ -444,12 +610,14 @@ ar_name_equal (name, mem, truncated)
 		       );
 #endif
    }
+#endif /* !VMS */

  return !strcmp (name, mem);

 #endif
 }

+#ifndef VMS
 /* ARGSUSED */
 static long int
 ar_member_pos (desc, mem, truncated,
@@ -532,6 +700,7 @@ ar_member_touch (arname, memname)
  errno = i;
  return -3;
 }
+#endif

 #ifdef TEST

--- a/build.sh.in
+++ b/build.sh.in
@@ -1,69 +0,0 @@
-#!/bin/sh
-# Shell script to build GNU Make in the absence of any `make' program.
-# @configure_input@
-
-# 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 `-lXXX'.
-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 $defines $CPPFLAGS $CFLAGS \
-      -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
@@ -2,9 +2,9 @@
 # Shell script to build GNU Make in the absence of any `make' program.
 # @configure_input@

-# Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1997 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)
@@ -14,7 +14,7 @@
 # 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.
--- a/build_w32.bat
+++ b/build_w32.bat
@@ -10,59 +10,59 @@ echo off
 echo "Creating GNU make for Windows 95/NT"
 echo on
 if not exist .\WinDebug\nul mkdir .\WinDebug
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D TIVOLI /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c variable.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D TIVOLI /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c variable.c
 echo WinDebug\variable.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c rule.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c rule.c
 echo WinDebug\rule.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c remote-stub.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c remote-stub.c
 echo WinDebug\remote-stub.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c commands.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c commands.c
 echo WinDebug\commands.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c file.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c file.c
 echo WinDebug\file.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c getloadavg.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c getloadavg.c
 echo WinDebug\getloadavg.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c default.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c default.c
 echo WinDebug\default.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c signame.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c signame.c
 echo WinDebug\signame.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c expand.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c expand.c
 echo WinDebug\expand.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c dir.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c dir.c
 echo WinDebug\dir.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c main.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c main.c
 echo WinDebug\main.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c getopt1.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c getopt1.c
 echo WinDebug\getopt1.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c job.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c job.c
 echo WinDebug\job.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c read.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c read.c
 echo WinDebug\read.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c version.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c version.c
 echo WinDebug\version.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c getopt.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c getopt.c
 echo WinDebug\getopt.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c arscan.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c arscan.c
 echo WinDebug\arscan.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c remake.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c remake.c
 echo WinDebug\remake.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c misc.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c misc.c
 echo WinDebug\misc.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c ar.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c ar.c
 echo WinDebug\ar.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c function.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c function.c
 echo WinDebug\function.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c vpath.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c vpath.c
 echo WinDebug\vpath.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c implicit.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c implicit.c
 echo WinDebug\implicit.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c  .\w32\compat\dirent.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c  .\w32\compat\dirent.c
 echo WinDebug\dirent.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c  .\glob\glob.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c  .\glob\glob.c
 echo WinDebug\glob.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c  .\glob\fnmatch.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c  .\glob\fnmatch.c
 echo WinDebug\fnmatch.obj >>link.dbg
-cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c  .\w32\pathstuff.c
+cl.exe /nologo /MT /W3 /GX /Zi /YX /Od /I . /I glob /I w32/include /D _DEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinDebug/ /Fp.\WinDebug/%make%.pch /Fo.\WinDebug/ /Fd.\WinDebug/%make%.pdb /c  .\w32\pathstuff.c
 echo WinDebug\pathstuff.obj >>link.dbg
 echo off
 echo "Linking WinDebug/%make%.exe"
@@ -73,59 +73,59 @@ if not exist .\WinDebug/%make%.exe echo "WinDebug build failed"
 if exist .\WinDebug/%make%.exe echo "WinDebug build succeeded!"
 if not exist .\WinRel\nul mkdir .\WinRel
 echo on
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /D TIVOLI /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c variable.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /D TIVOLI /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c variable.c
 echo WinRel\variable.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c rule.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c rule.c
 echo WinRel\rule.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c remote-stub.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c remote-stub.c
 echo WinRel\remote-stub.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c commands.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c commands.c
 echo WinRel\commands.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c file.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c file.c
 echo WinRel\file.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c getloadavg.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c getloadavg.c
 echo WinRel\getloadavg.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c default.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c default.c
 echo WinRel\default.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c signame.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c signame.c
 echo WinRel\signame.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c expand.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c expand.c
 echo WinRel\expand.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c dir.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c dir.c
 echo WinRel\dir.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c main.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c main.c
 echo WinRel\main.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c getopt1.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c getopt1.c
 echo WinRel\getopt1.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c job.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c job.c
 echo WinRel\job.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c read.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c read.c
 echo WinRel\read.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c version.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c version.c
 echo WinRel\version.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c getopt.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c getopt.c
 echo WinRel\getopt.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c arscan.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c arscan.c
 echo WinRel\arscan.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c remake.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c remake.c
 echo WinRel\remake.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c misc.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c misc.c
 echo WinRel\misc.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c ar.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c ar.c
 echo WinRel\ar.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c function.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c function.c
 echo WinRel\function.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c vpath.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c vpath.c
 echo WinRel\vpath.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c implicit.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c implicit.c
 echo WinRel\implicit.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c  .\w32\compat\dirent.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c  .\w32\compat\dirent.c
 echo WinRel\dirent.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c  .\glob\glob.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c  .\glob\glob.c
 echo WinRel\glob.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c  .\glob\fnmatch.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c  .\glob\fnmatch.c
 echo WinRel\fnmatch.obj >>link.rel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c  .\w32\pathstuff.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I . /I glob /I w32/include /D NDEBUG /D WINDOWS32 /D WIN32 /D _CONSOLE /D HAVE_CONFIG_H /D NO_ARCHIVES /FR.\WinRel/ /Fp.\WinRel/%make%.pch /Fo.\WinRel/ /c  .\w32\pathstuff.c
 echo WinRel\pathstuff.obj >>link.rel
 echo off
 echo "Linking WinRel/%make%.exe"
--- a/commands.c
+++ b/commands.c
@@ -1,5 +1,5 @@
 /* Command processing for GNU Make.
-Copyright (C) 1988, 89, 91, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+Copyright (C) 1988,89,91,92,93,94,95,96,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
--- a/274
+++ b/274
@@ -1,274 +0,0 @@
-# NOTE: If you have no `make' program at all to process this makefile, run
-# `build.sh' instead.
-#
-# Copyright (C) 1988,89,91,92,93,94,95,96 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.
-
-#
-#	Makefile for GNU Make
-#
-
-# Ultrix 2.2 make doesn't expand the value of VPATH.
-VPATH = @srcdir@
-# This must repeat the value, because configure will remove `VPATH = .'.
-srcdir = @srcdir@
-
-CC = @CC@
-
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-
-# Define these for your system as follows:
-#	-DNO_ARCHIVES		To disable `ar' archive support.
-#	-DNO_FLOAT		To avoid using floating-point numbers.
-#	-DENUM_BITFIELDS	If the compiler isn't GCC but groks enum foo:2.
-#				Some compilers apparently accept this
-#				without complaint but produce losing code,
-#				so beware.
-# NeXT 1.0a uses an old version of GCC, which required -D__inline=inline.
-# See also `config.h'.
-defines = @DEFS@ -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\"
-
-# Which flavor of remote job execution support to use.
-# The code is found in `remote-$(REMOTE).c'.
-REMOTE = @REMOTE@
-
-# If your system doesn't have alloca, or the one provided is bad, define this.
-ALLOCA = @ALLOCA@
-ALLOCA_SRC = $(srcdir)/alloca.c
-
-# If your system needs extra libraries loaded in, define them here.
-# System V probably need -lPW for alloca.  HP-UX 7.0's alloca in
-# libPW.a is broken on HP9000s300 and HP9000s400 machines.  Use
-# alloca.c instead on those machines.
-LOADLIBES = @LIBS@
-
-# Any extra object files your system needs.
-extras = @LIBOBJS@
-
-# Common prefix for machine-independent installed files.
-prefix = @prefix@
-# Common prefix for machine-dependent installed files.
-exec_prefix = @exec_prefix@
-
-# Directory to install `make' in.
-bindir = $(exec_prefix)/bin
-# Directory to find libraries in for `-lXXX'.
-libdir = $(exec_prefix)/lib
-# Directory to search by default for included makefiles.
-includedir = $(prefix)/include
-# Directory to install the Info files in.
-infodir = $(prefix)/info
-# Directory to install the man page in.
-mandir = $(prefix)/man/man$(manext)
-# Number to put on the man page filename.
-manext = 1
-# Prefix to put on installed `make' binary file name.
-binprefix =
-# Prefix to put on installed `make' man page file name.
-manprefix = $(binprefix)
-
-# Whether or not make needs to be installed setgid.
-# The value should be either `true' or `false'.
-# On many systems, the getloadavg function (used to implement the `-l'
-# switch) will not work unless make is installed setgid kmem.
-install_setgid = @NEED_SETGID@
-# Install make setgid to this group so it can read /dev/kmem.
-group = @KMEM_GROUP@
-
-# Program to install `make'.
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-# Program to install the man page.
-INSTALL_DATA = @INSTALL_DATA@
-# Generic install program.
-INSTALL = @INSTALL@
-
-# Program to format Texinfo source into Info files.
-MAKEINFO = makeinfo
-# Program to format Texinfo source into DVI files.
-TEXI2DVI = texi2dvi
-
-# Programs to make tags files.
-ETAGS = etags -w
-CTAGS = ctags -w
-
-GLOB = glob/libglob.a
-
-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 remote-$(REMOTE).o	\
-       getopt.o getopt1.o						\
-       $(GLOB) $(ALLOCA) $(extras)
-srcs = $(srcdir)/commands.c $(srcdir)/job.c $(srcdir)/dir.c		\
-       $(srcdir)/file.c $(srcdir)/getloadavg.c $(srcdir)/misc.c		\
-       $(srcdir)/main.c $(srcdir)/read.c $(srcdir)/remake.c		\
-       $(srcdir)/rule.c $(srcdir)/implicit.c $(srcdir)/default.c	\
-       $(srcdir)/variable.c $(srcdir)/expand.c $(srcdir)/function.c	\
-       $(srcdir)/vpath.c $(srcdir)/version.c				\
-       $(srcdir)/remote-$(REMOTE).c					\
-       $(srcdir)/ar.c $(srcdir)/arscan.c				\
-       $(srcdir)/signame.c $(srcdir)/signame.h				\
-       $(srcdir)/getopt.c $(srcdir)/getopt1.c $(srcdir)/getopt.h	\
-       $(srcdir)/commands.h $(srcdir)/dep.h $(srcdir)/filedef.h		\
-       $(srcdir)/job.h $(srcdir)/make.h $(srcdir)/rule.h		\
-       $(srcdir)/variable.h $(ALLOCA_SRC) $(srcdir)/config.h.in
-
-
-.SUFFIXES:
-.SUFFIXES: .o .c .h .ps .dvi .info .texinfo
-
-all: make
-info: make.info
-dvi: make.dvi
-# Some makes apparently use .PHONY as the default goal if it is before `all'.
-.PHONY: all check info dvi
-
-make.info: make.texinfo
-	$(MAKEINFO) -I$(srcdir) $(srcdir)/make.texinfo -o make.info
-
-make.dvi: make.texinfo
-	$(TEXI2DVI) $(srcdir)/make.texinfo
-
-make.ps: make.dvi
-	dvi2ps make.dvi > make.ps
-
-make: $(objs)
-	$(CC) $(LDFLAGS) $(objs) $(LOADLIBES) -o make.new
-	mv -f make.new make
-
-# -I. is needed to find config.h in the build directory.
-.c.o:
-	$(CC) $(defines) -c -I. -I$(srcdir) -I$(srcdir)/glob \
-	      $(CPPFLAGS) $(CFLAGS) $< $(OUTPUT_OPTION)
-
-# For some losing Unix makes.
-SHELL = /bin/sh
-MAKE = make
-
-$(GLOB): FORCE config.h
-	cd glob; $(MAKE) libglob.a
-FORCE:
-
-tagsrcs = $(srcs) $(srcdir)/remote-*.c
-TAGS: $(tagsrcs)
-	$(ETAGS) $(tagsrcs)
-tags: $(tagsrcs)
-	$(CTAGS) $(tagsrcs)
-
-.PHONY: install installdirs
-install: installdirs \
-	 $(bindir)/$(binprefix)make $(infodir)/make.info \
-	 $(mandir)/$(manprefix)make.$(manext)
-
-installdirs:
-	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(mandir)
-
-$(bindir)/$(binprefix)make: make
-	$(INSTALL_PROGRAM) make $@.new
-	@if $(install_setgid); then \
-	   if chgrp $(group) $@.new && chmod g+s $@.new; then \
-	     echo "chgrp $(group) $@.new && chmod g+s $@.new"; \
-	   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 privileges to install $@."; \
-	   fi; \
-	 else true; fi
-# Some systems can't deal with renaming onto a running binary.
-	-rm -f $@.old
-	-mv $@ $@.old
-	mv $@.new $@
-
-$(infodir)/make.info: make.info
-	if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
-	for file in $${dir}/make.info*; do \
-	  name="`basename $$file`"; \
-	  $(INSTALL_DATA) $$file \
-	    `echo $@ | sed "s,make.info\$$,$$name,"`; \
-	done
-# Run install-info only if it exists.
-# Use `if' instead of just prepending `-' to the
-# line so we notice real errors from install-info.
-# We use `$(SHELL) -c' because some shells do not
-# fail gracefully when there is an unknown command.
-	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
-	  install-info --info-dir=$(infodir) $$dir/make.info; \
-	else true; fi
-
-$(mandir)/$(manprefix)make.$(manext): make.man
-	$(INSTALL_DATA) $(srcdir)/make.man $@
-
-
-loadavg: loadavg.c config.h
-	$(CC) $(defines) -DTEST -I. -I$(srcdir) $(CFLAGS) $(LDFLAGS) \
-	      loadavg.c $(LOADLIBES) -o $@
-# We copy getloadavg.c into a different file rather than compiling it
-# directly because some compilers clobber getloadavg.o in the process.
-loadavg.c: getloadavg.c
-	ln $(srcdir)/getloadavg.c loadavg.c || \
-	cp $(srcdir)/getloadavg.c loadavg.c
-check-loadavg: loadavg
-	@echo The system uptime program believes the load average to be:
-	-uptime
-	@echo The GNU load average checking code believes:
-	./loadavg
-check: check-loadavg
-
-
-.PHONY: clean realclean distclean mostlyclean
-clean: glob-clean
-	-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
-glob-clean glob-realclean:
-	cd glob; $(MAKE) $@
-
-Makefile: config.status $(srcdir)/Makefile.in
-	$(SHELL) config.status
-glob/Makefile: config.status $(srcdir)/glob/Makefile.in
-	$(SHELL) config.status
-config.h: stamp-config ;
-stamp-config: config.status $(srcdir)/config.h.in
-	$(SHELL) config.status
-	touch stamp-config
-
-#configure: configure.in aclocal.m4
-#	cd $(srcdir) && autoconf $(ACFLAGS)
-#config.h.in: configure.in aclocal.m4
-#	cd $(srcdir) && autoheader $(ACFLAGS)
-
-# This tells versions [3.59,3.63) of GNU make not to export all variables.
-.NOEXPORT:
-
-# The automatically generated dependencies below may omit config.h
-# because it is included with ``#include <config.h>'' rather than
-# ``#include "config.h"''.  So we add the explicit dependency to make sure.
-$(objs): config.h
-
-# Automatically generated dependencies will be put at the end of the file.
-
--- a/config.ami.template
+++ b/config.ami.template
@@ -162,6 +162,12 @@
 /* Define vfork as fork if vfork does not work.  */
 #undef vfork

+/* Name of this package (needed by automake) */
+#define PACKAGE "%PACKAGE%"
+
+/* Version of this package (needed by automake) */
+#define VERSION "%VERSION%"
+
 /* Define to the name of the SCCS `get' command.  */
 #define SCCS_GET "get"

--- a/config.h-vms.template
+++ b/config.h-vms.template
@@ -114,7 +114,7 @@
 /* #undef NO_MINUS_C_MINUS_O */

 /* Define to `int' if <sys/types.h> doesn't define.  */
-#define pid_t int
+/* #undef pid_t */

 /* Define if the system does not provide POSIX.1 features except
   with this defined.  */
@@ -153,7 +153,7 @@
 /* #undef SYS_SIGLIST_DECLARED */

 /* Define to `int' if <sys/types.h> doesn't define.  */
-#define uid_t int
+/* #undef uid_t */

 /* Define for Encore UMAX.  */
 /* #undef UMAX */
@@ -162,6 +162,12 @@
   instead of <sys/cpustats.h>.  */
 /* #undef UMAX4_3 */

+/* Name of this package (needed by automake) */
+#define PACKAGE "%PACKAGE%"
+
+/* Version of this package (needed by automake) */
+#define VERSION "%VERSION%"
+
 /* Define vfork as fork if vfork does not work.  */
 /* #undef vfork */

--- a/config.h.W32.template
+++ b/config.h.W32.template
@@ -176,6 +176,12 @@
 /* Define vfork as fork if vfork does not work.  */
 #undef vfork

+/* Name of this package (needed by automake) */
+#define PACKAGE "%PACKAGE%"
+
+/* Version of this package (needed by automake) */
+#define VERSION "%VERSION%"
+
 /* Define to the name of the SCCS `get' command.  */
 #undef SCCS_GET
 #define SCCS_GET "echo no sccs get"
--- a/config.h.in
+++ b/config.h.in
@@ -1,276 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-#undef _ALL_SOURCE
-#endif
-
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define for DGUX with <sys/dg_sys_info.h>.  */
-#undef DGUX
-
-/* Define if the `getloadavg' function needs to be run setuid or setgid.  */
-#undef GETLOADAVG_PRIVILEGED
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef gid_t
-
-/* Define if you have alloca, as a function or macro.  */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
-
-/* Define if you don't have vprintf but do have _doprnt.  */
-#undef HAVE_DOPRNT
-
-/* Define if your system has a working fnmatch function.  */
-#undef HAVE_FNMATCH
-
-/* Define if your system has its own `getloadavg' function.  */
-#undef HAVE_GETLOADAVG
-
-/* Define if you have the getmntent function.  */
-#undef HAVE_GETMNTENT
-
-/* Define if the `long double' type works.  */
-#undef HAVE_LONG_DOUBLE
-
-/* Define if you support file names longer than 14 characters.  */
-#undef HAVE_LONG_FILE_NAMES
-
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
-
-/* Define if system calls automatically restart after interruption
-   by a signal.  */
-#undef HAVE_RESTARTABLE_SYSCALLS
-
-/* Define if your struct stat has st_blksize.  */
-#undef HAVE_ST_BLKSIZE
-
-/* Define if your struct stat has st_blocks.  */
-#undef HAVE_ST_BLOCKS
-
-/* Define if you have the strcoll function and it is properly defined.  */
-#undef HAVE_STRCOLL
-
-/* Define if your struct stat has st_rdev.  */
-#undef HAVE_ST_RDEV
-
-/* Define if you have the strftime function.  */
-#undef HAVE_STRFTIME
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if your struct tm has tm_zone.  */
-#undef HAVE_TM_ZONE
-
-/* Define if you don't have tm_zone but do have the external array
-   tzname.  */
-#undef HAVE_TZNAME
-
-/* Define if you have <unistd.h>.  */
-#undef HAVE_UNISTD_H
-
-/* Define if utime(file, NULL) sets file's timestamp to the present.  */
-#undef HAVE_UTIME_NULL
-
-/* Define if you have <vfork.h>.  */
-#undef HAVE_VFORK_H
-
-/* Define if you have the vprintf function.  */
-#undef HAVE_VPRINTF
-
-/* Define if you have the wait3 system call.  */
-#undef HAVE_WAIT3
-
-/* Define if on MINIX.  */
-#undef _MINIX
-
-/* Define if your struct nlist has an n_un member.  */
-#undef NLIST_NAME_UNION
-
-/* Define if you have <nlist.h>.  */
-#undef NLIST_STRUCT
-
-/* Define if your C compiler doesn't accept -c and -o together.  */
-#undef NO_MINUS_C_MINUS_O
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef pid_t
-
-/* Define if the system does not provide POSIX.1 features except
-   with this defined.  */
-#undef _POSIX_1_SOURCE
-
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
-
-/* Define if the setvbuf function takes the buffering type as its second
-   argument and the buffer pointer as the third, as on System V
-   before release 3.  */
-#undef SETVBUF_REVERSED
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
-#undef STAT_MACROS_BROKEN
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define on System V Release 4.  */
-#undef SVR4
-
-/* Define if `sys_siglist' is declared by <signal.h>.  */
-#undef SYS_SIGLIST_DECLARED
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef uid_t
-
-/* Define for Encore UMAX.  */
-#undef UMAX
-
-/* Define for Encore UMAX 4.3 that has <inq_status/cpustats.h>
-   instead of <sys/cpustats.h>.  */
-#undef UMAX4_3
-
-/* Define vfork as fork if vfork does not work.  */
-#undef vfork
-
-/* Define to the name of the SCCS `get' command.  */
-#undef SCCS_GET
-
-/* Define this if the SCCS `get' command understands the `-G<file>' option.  */
-#undef SCCS_GET_MINUS_G
-
-/* Define this if the C library defines the variable `sys_siglist'.  */
-#undef HAVE_SYS_SIGLIST
-
-/* 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 if you have the dup2 function.  */
-#undef HAVE_DUP2
-
-/* Define if you have the getcwd function.  */
-#undef HAVE_GETCWD
-
-/* Define if you have the getgroups function.  */
-#undef HAVE_GETGROUPS
-
-/* Define if you have the getloadavg function.  */
-#undef HAVE_GETLOADAVG
-
-/* Define if you have the memmove function.  */
-#undef HAVE_MEMMOVE
-
-/* Define if you have the mktemp function.  */
-#undef HAVE_MKTEMP
-
-/* Define if you have the psignal function.  */
-#undef HAVE_PSIGNAL
-
-/* Define if you have the setegid function.  */
-#undef HAVE_SETEGID
-
-/* Define if you have the seteuid function.  */
-#undef HAVE_SETEUID
-
-/* Define if you have the setlinebuf function.  */
-#undef HAVE_SETLINEBUF
-
-/* Define if you have the setregid function.  */
-#undef HAVE_SETREGID
-
-/* Define if you have the setreuid function.  */
-#undef HAVE_SETREUID
-
-/* Define if you have the sigsetmask function.  */
-#undef HAVE_SIGSETMASK
-
-/* Define if you have the strerror function.  */
-#undef HAVE_STRERROR
-
-/* Define if you have the strsignal function.  */
-#undef HAVE_STRSIGNAL
-
-/* Define if you have the wait3 function.  */
-#undef HAVE_WAIT3
-
-/* Define if you have the waitpid function.  */
-#undef HAVE_WAITPID
-
-/* Define if you have the <dirent.h> header file.  */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
-
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
-
-/* Define if you have the <mach/mach.h> header file.  */
-#undef HAVE_MACH_MACH_H
-
-/* Define if you have the <memory.h> header file.  */
-#undef HAVE_MEMORY_H
-
-/* Define if you have the <ndir.h> header file.  */
-#undef HAVE_NDIR_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <sys/dir.h> header file.  */
-#undef HAVE_SYS_DIR_H
-
-/* Define if you have the <sys/ndir.h> header file.  */
-#undef HAVE_SYS_NDIR_H
-
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <sys/timeb.h> header file.  */
-#undef HAVE_SYS_TIMEB_H
-
-/* Define if you have the <sys/wait.h> header file.  */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the dgc library (-ldgc).  */
-#undef HAVE_LIBDGC
-
-/* Define if you have the kstat library (-lkstat).  */
-#undef HAVE_LIBKSTAT
-
-/* Define if you have the sun library (-lsun).  */
-#undef HAVE_LIBSUN
--- a/configh.dos.template
+++ b/configh.dos.template
@@ -1,80 +1,24 @@
 /* Generated automatically from configure.in by autoheader.  DO NOT EDIT!  */

-#define INCLUDEDIR "c:/djgpp/include"
-#define LIBDIR "c:/djgpp/lib"
+/* Many things are defined already by a system header.  */
+#include <sys/config.h>

-/* Define if you have dirent.h.  */
-#define HAVE_DIRENT_H
+/* Name of this package (needed by automake) */
+#define PACKAGE "%PACKAGE%"

-/* Define if you have the strcoll function and it is properly defined.  */
-#define HAVE_STRCOLL
-
-/* Define if you have unistd.h.  */
-#define HAVE_UNISTD_H
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define if you have the ANSI C header files.  */
-#ifndef STDC_HEADERS
-#define STDC_HEADERS
-#endif
-
-/* Define if `sys_siglist' is declared by <signal.h>.  */
-#undef SYS_SIGLIST_DECLARED
-
-/* Define if you have sys_siglist.  */
-#undef HAVE_SYS_SIGLIST
-
-/* Define if you have _sys_siglist.  */
-#undef HAVE__SYS_SIGLIST
-
-/* Define if you have psignal.  */
-#define HAVE_PSIGNAL
-
-/* Define if you have strsignal.  */
-#undef HAVE_STRSIGNAL
+/* Version of this package (needed by automake) */
+#define VERSION "%VERSION%"

 /* Define NSIG.  */
 #define NSIG SIGMAX

-/* Define if you have getdtablesize.  */
-#define HAVE_GETDTABLESIZE
-
-/* Define if you have dup2.  */
-#define HAVE_DUP2
-
-/* Define if you have getcwd.  */
-#define HAVE_GETCWD
-
 /* Define if you have sigsetmask.  */
-#define HAVE_SIGSETMASK
-
-/* Define if you have setlinebuf.  */
-#define HAVE_SETLINEBUF
-
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H
-
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <fcntl.h> header file.  */
-#define HAVE_FCNTL_H
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H
+#define HAVE_SIGSETMASK 1

 /* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H
+#define HAVE_MEMORY_H 1

 /* Define if you have the memmove function.  */
-#define HAVE_MEMMOVE
-
-/* Define if you have the `strerror' function.  */
-#define HAVE_STRERROR
-
-/* Define if you have the <sys/wait.h> header file.  */
-#define HAVE_SYS_WAIT_H
+#define HAVE_MEMMOVE 1

 #define SCCS_GET "get"
--- a/3501
+++ b/3501
--- a/configure.bat
+++ b/configure.bat
@@ -1,8 +1,21 @@
@echo off
 echo Configuring MAKE for DJGPP
-rem This batch file assumes a unix-type "sed" program

-update configh.dos config.h
+rem The SmallEnv trick protects against too small environment block,
+rem in which case the values will be truncated and the whole thing
+rem goes awry.  COMMAND.COM will say "Out of environment space", but
+rem many people don't care, so we force them to care by refusing to go.
+
+rem Where is the srcdir?
+set XSRC=.
+if not "%XSRC%"=="." goto SmallEnv
+if "%1%"=="" goto SrcDone
+set XSRC=%1
+if not "%XSRC%"=="%1" goto SmallEnv
+
+:SrcDone
+
+update %XSRC%/configh.dos ./config.h

 rem Do they have Make?
 redir -o junk.$$$ -eo make -n -f NUL
@@ -15,69 +28,17 @@ if exist junk.$$$ del junk.$$$
 echo No Make program found--use DOSBUILD.BAT to build Make.
 goto End

-rem They do have Make.	Generate Makefiles.
+rem They do have Make.	Generate the Makefile.

 :MakeOk
 del junk.$$$
-echo # Makefile generated for DJGPP by "configure.bat"> Makefile
-
-if exist config.sed del config.sed
-
-echo ": try_sl						">> config.sed
-echo "/\\$/ {						">> config.sed
-echo "	N						">> config.sed
-echo "	s/[	]*\\\n[		]*/ /			">> config.sed
-echo "	b try_sl					">> config.sed
-echo "}							">> config.sed
-
-echo "s/@srcdir@/./					">> config.sed
-echo "s/@exec_prefix@/$(DJDIR)/				">> config.sed
-echo "s/@prefix@/$(DJDIR)/				">> config.sed
-echo "s/@CC@/gcc/					">> config.sed
-echo "s/@CFLAGS@/-O2 -g/				">> config.sed
-if "%1"=="no-float" goto nofloat
-if "%1"=="NO-FLOAT" goto nofloat
-if "%1"=="NO_FLOAT" goto nofloat
-if "%1"=="no_float" goto nofloat
-echo "s/@CPPFLAGS@/-DHAVE_CONFIG_H/			">> config.sed
-goto floatdone
-:nofloat
-echo "s/@CPPFLAGS@/-DHAVE_CONFIG_H -DNO_FLOAT/		">> config.sed
-:floatdone
-echo "s/@LDFLAGS@//					">> config.sed
-echo "s/@RANLIB@/ranlib/				">> config.sed
-echo "s/@DEFS@//					">> config.sed
-echo "s/@REMOTE@/stub/					">> config.sed
-echo "s/@ALLOCA@//					">> config.sed
-echo "s/@LIBS@//					">> config.sed
-echo "s/@LIBOBJS@//					">> config.sed
-echo "s/@SET_MAKE@//					">> config.sed
-echo "s/@NEED_SETGID@/false/				">> config.sed
-echo "s/@INSTALL_PROGRAM@/install/			">> config.sed
-echo "s/@INSTALL_DATA@/install -m 644/			">> config.sed
-echo "s/@INSTALL@/install/				">> config.sed
-echo "s/^Makefile *:/_Makefile:/			">> config.sed
-echo "s/^config.h *:/_config.h:/			">> config.sed
-echo "s/^defines *=.*$/defines =/			">> config.sed
-echo "/mv -f make.new make/d				">> config.sed
-
-echo "s/cd glob; $(MAKE)/$(MAKE) -C glob/		">> config.sed
-
-echo "/^tagsrcs *=/s/\$(srcs)/$(srcs:.h.in=.h)/		">> config.sed
-
-echo "s/\*.o/*.o *.exe make.new/			">> config.sed
-echo "s/\.info\*/.i*/g					">> config.sed
-
-sed -e "s/^\"//" -e "s/\"$//" -e "s/[	]*$//" config.sed > config2.sed
-if exist config2.sed goto SedOk
-echo To configure Make you need a Unix-style Sed program!
+update %XSRC%/Makefile.DOS ./Makefile
+echo Done.
+if not "%XSRC%"=="." echo Invoke Make thus: "make srcdir=%XSRC%"
 goto End
-:SedOk
-sed -f config2.sed Makefile.in >> Makefile
-del config.sed
-del config2.sed

-cd glob
-call configure
-cd ..
+:SmallEnv
+echo Your environment is too small.  Please enlarge it and run me again.
+
 :End
+set XRSC=
--- a/configure.in
+++ b/configure.in
@@ -1,14 +1,21 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION([$Id$])
-AC_PREREQ(2.10)dnl		dnl Minimum Autoconf version required.
+AC_PREREQ(2.12)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.
+
+AM_INIT_AUTOMAKE(make, 3.75.92)
+AM_CONFIG_HEADER(config.h)
+AC_CONFIG_SUBDIRS(glob)
+
+AM_CONDITIONAL(MAINT_MAKEFILE, test -r $srcdir/maintMakefile)
+
+dnl Regular configure stuff

 AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_CPP			dnl Later checks need this.
+AC_ARG_PROGRAM
 AC_AIX
 AC_ISC_POSIX
 AC_MINIX
--- a/dir.c
+++ b/dir.c
@@ -1,5 +1,5 @@
 /* Directory hashing for GNU Make.
-Copyright (C) 1988, 89, 91, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+Copyright (C) 1988,89,91,92,93,94,95,96,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -179,13 +179,16 @@ vmsstat_dir (name, st)
    {
      *s++ = 0;
      st->st_dev = (char *)vms_hash (name);
+      h = vms_hash (s);
+      *(s-1) = ':';
    }
  else
    {
      st->st_dev = 0;
      s = name;
+      h = vms_hash (s);
    }
-  h = vms_hash (s);
+
  st->st_ino[0] = h & 0xff;
  st->st_ino[1] = h & 0xff00;
  st->st_ino[2] = h >> 16;
--- a/file.c
+++ b/file.c
@@ -1,5 +1,5 @@
 /* Target file hash table management for GNU Make.
-Copyright (C) 1988,89,90,91,92,93,94,95,96 Free Software Foundation, Inc.
+Copyright (C) 1988,89,90,91,92,93,94,95,96,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -187,6 +187,23 @@ rehash_file (file, name)
  file_hash_enter (file, name, oldhash, file->name);
 }

+/* Rename FILE to NAME.  This is not as simple as resetting
+   the `name' member, since it must be put in a new hash bucket,
+   and possibly merged with an existing file called NAME.  */
+
+void
+rename_file (file, name)
+     register struct file *file;
+     char *name;
+{
+  rehash_file(file, name);
+  while (file)
+    {
+      file->name = file->hname;
+      file = file->prev;
+    }
+}
+
 void
 file_hash_enter (file, name, oldhash, oldname)
     register struct file *file;
@@ -524,9 +541,7 @@ print_file (f)
     struct file *f;
 {
  register struct dep *d;
-#ifdef VMS
-  extern char *cvt_time PARAMS ((unsigned long));
-#endif
+
  putchar ('\n');
  if (!f->is_target)
    puts ("# Not a target:");
@@ -562,13 +577,8 @@ print_file (f)
  else if (f->last_mtime == (time_t) -1)
    puts ("#  File does not exist.");
  else
-#ifdef VMS
-    printf ("#  Last modified %.24s (%0lx)\n",
-	    cvt_time(f->last_mtime), (unsigned long) f->last_mtime);
-#else
    printf ("#  Last modified %.24s (%ld)\n",
 	    ctime (&f->last_mtime), (long int) f->last_mtime);
-#endif
  printf ("#  File has%s been updated.\n",
 	  f->updated ? "" : " not");
  switch (f->command_state)
--- a/filedef.h
+++ b/filedef.h
@@ -1,5 +1,5 @@
 /* Definition of target file data structures for GNU Make.
-Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 97 Free Software Foundation, Inc.
+Copyright (C) 1988,89,90,91,92,93,94,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -91,7 +91,7 @@ extern struct file *default_goal_file, *suffix_file, *default_file;

 extern struct file *lookup_file (), *enter_file ();
 extern void remove_intermediates (), snap_deps ();
-extern void rehash_file (), file_hash_enter ();
+extern void rename_file (), rehash_file (), file_hash_enter ();
 extern void set_command_state ();


@@ -112,9 +112,14 @@ extern time_t f_mtime ();
   trouble when the machine running make and the machine holding a file have
   different ideas about what time it is; and can also lose for `force'
   targets, which need to be considered newer than anything that depends on
-   them, even if said dependents' modtimes are in the future.  */
-#define NEW_MTIME	INTEGER_TYPE_MAXIMUM (time_t)
+   them, even if said dependents' modtimes are in the future.

+   If time_t is unsigned, its maximum value is the same as "(time_t) -1",
+   so use one less than that, because -1 is used for non-existing files.  */
+#define NEW_MTIME \
+     (INTEGER_TYPE_SIGNED (time_t) \
+      ? INTEGER_TYPE_MAXIMUM (time_t) \
+      : (INTEGER_TYPE_MAXIMUM (time_t) - 1))

 #define check_renamed(file) \
  while ((file)->renamed != 0) (file) = (file)->renamed /* No ; here.  */
--- a/function.c
+++ b/function.c
@@ -1,5 +1,5 @@
 /* Variable function expansion for GNU Make.
-Copyright (C) 1988, 89, 91, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+Copyright (C) 1988,89,91,92,93,94,95,96,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -1049,8 +1049,15 @@ expand_function (o, function, text, end)
      text = expand_argument (text, end);

      p2 = text;
-      while ((p = find_next_token (&p2, &i)) != 0)
+      while (*p2 != '\0')
 	{
+          while (isspace(*p2))
+            ++p2;
+          p = p2;
+          for (i=0; *p2 != '\0' && !isspace(*p2); ++p2, ++i)
+            {}
+          if (!i)
+            break;
 	  o = variable_buffer_output (o, p, i);
 	  o = variable_buffer_output (o, " ", 1);
 	  doneany = 1;
--- a/getopt.c
+++ b/getopt.c
@@ -6,23 +6,23 @@
   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97
   	Free Software Foundation, Inc.

-   NOTE: The canonical source of this file is maintained with the GNU C Library.
-   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.

-   This program 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.
+This program 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.

-   This program 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.
+This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.  */

 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
   Ditto for AIX 3.2 and <stdlib.h>.  */
@@ -79,7 +79,7 @@
 #endif
 #endif

-#if defined (WIN32) && !defined (__CYGWIN32__)
+#if defined (_WINDOWS32) && !defined (__CYGWIN32__)
 /* It's not Unix, really.  See?  Capital letters.  */
 #include <windows.h>
 #define getpid() GetCurrentProcessId()
--- a/glob/COPYING.LIB.old
+++ b/glob/COPYING.LIB.old
--- a/glob/ChangeLog
+++ b/glob/ChangeLog
@@ -1,3 +1,24 @@
+Tue Aug 12 10:52:34 1997  Paul D. Smith  <psmith@baynetworks.com>
+
+	* configure.in: Require autoconf 2.12.
+
+	* glob: Updates from latest GNU libc glob code.
+
+	* glob.c,glob.h,fnmatch.h: Change all WIN32 references to WINDOWS32.
+
+	* glob.h: OSF4 defines macros in such a way that GLOB_ALTDIRFUNC
+	is not defined.  Added a test to the #if which defines it if
+	_GNU_SOURCE is defined; that's set by both glob.c and GNU make.
+
+	* glob.c: SunOS4 w/ cc needs #include <stdio.h>, since assert.h
+	requires stderr but doesn't include stdio.h :-/.
+	(next_brace_sub): De-protoize function definition.
+	(glob): Cast __alloca(); on SunOS4 it uses the default return type
+	of int.
+	(glob): Irix defines getlogin_r() to return a char*; move the
+	extern for that into the _LIBC area since it isn't used except in
+	LIBC anyway.  Likewise, move extern getlogin() into the "else".
+
 Sat Jul 20 21:55:31 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>

 	Win32 hacks from <Rob_Tulloh@tivoli.com>.
--- a/glob/Makefile.am
+++ b/glob/Makefile.am
@@ -0,0 +1,10 @@
+# -*-Makefile-*-, or close enough
+
+AUTOMAKE_OPTIONS =	1.2 foreign
+
+noinst_LIBRARIES =	libglob.a
+
+libglob_a_SOURCES =	glob.c glob.h fnmatch.c fnmatch.h
+
+EXTRA_DIST =		COPYING.LIB Makefile.ami SCOPTIONS SMakefile \
+			configure.bat
--- a/glob/Makefile.in
+++ b/glob/Makefile.in
@@ -1,66 +0,0 @@
-# Makefile for standalone distribution of libglob.a (fnmatch, glob).
-
-# Copyright (C) 1991, 92, 93, 94, 95 Free Software Foundation, Inc.
-# This file is part of the GNU C Library.
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public License
-# as published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-
-# This library 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
-# Library General Public License for more details.
-
-# You should have received a copy of the GNU Library General Public
-# License along with this library; see the file COPYING.LIB.  If
-# not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-# Cambridge, MA 02139, USA.
-
-# Ultrix 2.2 make doesn't expand the value of VPATH.
-VPATH = @srcdir@
-# This must repeat the value, because configure will remove `VPATH = .'.
-srcdir = @srcdir@
-
-CC = @CC@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-
-# Information determined by configure.
-DEFS = @DEFS@
-
-# How to invoke ar.
-AR = @AR@
-ARFLAGS = rv
-
-# How to invoke ranlib.
-RANLIB = @RANLIB@
-
-.PHONY: all
-all: libglob.a
-
-libglob.a: glob.o fnmatch.o
-	$(AR) $(ARFLAGS) $@ glob.o fnmatch.o
-	$(RANLIB) $@
-
-# For some reason, Unix make wants the dependencies on the source files.
-# Otherwise it refuses to use an implicit rule!
-# And, get this: it doesn't work to use $(srcdir)/foo.c!!
-glob.o: $(srcdir)/glob.h $(srcdir)/fnmatch.h glob.c
-fnmatch.o: $(srcdir)/fnmatch.h fnmatch.c
-
-.c.o:
-	$(CC) -I. -I$(srcdir) -c \
-	      $(DEFS) $(CPPFLAGS) $(CFLAGS) $< $(OUTPUT_OPTION)
-
-.PHONY: clean realclean glob-clean glob-realclean distclean
-clean glob-clean:
-	-rm -f libglob.a *.o core
-distclean glob-realclean: clean
-	-rm -f TAGS tags Makefile config.status config.h config.log
-realcean: distclean
-
-# For inside the C library.
-glob.tar glob.tar.Z:
-	$(MAKE) -C .. $@
--- a/glob/configure
+++ b/glob/configure
--- a/glob/configure.in
+++ b/glob/configure.in
@@ -1,6 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(fnmatch.c)		dnl A distinctive file to look for in srcdir.
-AC_PREREQ(2.1)			dnl Minimum Autoconf version required.
+AC_PREREQ(2.12)			dnl Minimum Autoconf version required.
+
+AM_INIT_AUTOMAKE(glob, 0.0, nodefs)
+
 AC_PROG_CC
 AC_CHECK_PROG(AR, ar, ar, ar)
 AC_PROG_RANLIB
--- a/glob/fnmatch.h
+++ b/glob/fnmatch.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1997 Free Software Foundation, Inc.
   This file is part of the GNU C Library.

   The GNU C Library is free software; you can redistribute it and/or
@@ -17,7 +17,6 @@
   Boston, MA 02111-1307, USA.  */

 #ifndef	_FNMATCH_H
-
 #define	_FNMATCH_H	1

 #ifdef	__cplusplus
--- a/glob/glob.c
+++ b/glob/glob.c
@@ -37,6 +37,8 @@
 /* #define NDEBUG 1 */
 #include <assert.h>

+#include <stdio.h>		/* Needed on stupid SunOS for assert.  */
+

 /* Comment out all this code if we are using the GNU C Library, and are not
   actually compiling the library itself.  This code is part of the GNU C
@@ -250,7 +252,6 @@ extern char *alloca ();
 #undef	GLOB_PERIOD
 #include <glob.h>

-static int glob_pattern_p __P ((const char *pattern, int quote));
 static int glob_in_dir __P ((const char *pattern, const char *directory,
 			     int flags,
 			     int (*errfunc) __P ((const char *, int)),
@@ -266,7 +267,8 @@ static
 inline
 #endif
 const char *
-next_brace_sub (const char *begin)
+next_brace_sub (begin)
+     const char *begin;
 {
  unsigned int depth = 0;
  const char *cp = begin;
@@ -288,7 +290,7 @@ next_brace_sub (const char *begin)
 	  while (*cp != '\0' && (*cp != '}' || depth > 0))
 	    {
 	      if (*cp == '}')
-		++depth;
+		--depth;
 	      ++cp;
 	    }
 	  if (*cp == '\0')
@@ -308,7 +310,7 @@ next_brace_sub (const char *begin)
   If a directory cannot be opened or read and ERRFUNC is not nil,
   it is called with the pathname that caused the error, and the
   `errno' value from the failing call; if it returns non-zero
-   `glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
+   `glob' returns GLOB_ABORTED; if it returns zero, the error is ignored.
   If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
   Otherwise, `glob' returns zero.  */
 int
@@ -511,11 +513,9 @@ glob (pattern, flags, errfunc, pglob)
 #else
 	  if (home_dir == NULL || home_dir[0] == '\0')
 	    {
-	      extern char *getlogin __P ((void));
-	      extern int getlogin_r __P ((char *, size_t));
 	      int success;
-
 #if defined HAVE_GETLOGIN_R || defined _LIBC
+	      extern int getlogin_r __P ((char *, size_t));
 	      size_t buflen = sysconf (_SC_LOGIN_NAME_MAX) + 1;
 	      char *name;

@@ -523,11 +523,13 @@ glob (pattern, flags, errfunc, pglob)
 		/* `sysconf' does not support _SC_LOGIN_NAME_MAX.  Try
 		   a moderate value.  */
 		buflen = 16;
-	      name = __alloca (buflen);
+	      name = (char *) __alloca (buflen);

 	      success = getlogin_r (name, buflen) >= 0;
 #else
+	      extern char *getlogin __P ((void));
 	      char *name;
+
 	      success = (name = getlogin ()) != NULL;
 #endif
 	      if (success)
@@ -537,7 +539,7 @@ glob (pattern, flags, errfunc, pglob)
 		  char *pwtmpbuf;
 		  struct passwd pwbuf, *p;

-		  pwtmpbuf = __alloca (pwbuflen);
+		  pwtmpbuf = (char *) __alloca (pwbuflen);

 		  success = (__getpwnam_r (name, &pwbuf, pwtmpbuf,
 					   pwbuflen, &p) >= 0);
@@ -560,7 +562,7 @@ glob (pattern, flags, errfunc, pglob)
 	    {
 	      char *newp;
 	      size_t home_len = strlen (home_dir);
-	      newp = __alloca (home_len + dirlen);
+	      newp = (char *) __alloca (home_len + dirlen);
 	      memcpy (newp, home_dir, home_len);
 	      memcpy (&newp[home_len], &dirname[1], dirlen);
 	      dirname = newp;
@@ -577,7 +579,7 @@ glob (pattern, flags, errfunc, pglob)
 	    user_name = dirname + 1;
 	  else
 	    {
-	      user_name = __alloca (end_name - dirname);
+	      user_name = (char *) __alloca (end_name - dirname);
 	      memcpy (user_name, dirname + 1, end_name - dirname);
 	      user_name[end_name - dirname - 1] = '\0';
 	    }
@@ -586,7 +588,7 @@ glob (pattern, flags, errfunc, pglob)
 	  {
 #if defined HAVE_GETPWNAM_R || defined _LIBC
 	    size_t buflen = sysconf (_SC_GETPW_R_SIZE_MAX);
-	    char *pwtmpbuf = __alloca (buflen);
+	    char *pwtmpbuf = (char *) __alloca (buflen);
 	    struct passwd pwbuf, *p;
 	    if (__getpwnam_r (user_name, &pwbuf, pwtmpbuf, buflen, &p) >= 0)
 	      home_dir = p->pw_dir;
@@ -606,18 +608,18 @@ glob (pattern, flags, errfunc, pglob)
 	      char *newp;
 	      size_t home_len = strlen (home_dir);
 	      size_t rest_len = end_name == NULL ? 0 : strlen (end_name);
-	      newp = __alloca (home_len + rest_len + 1);
+	      newp = (char *) __alloca (home_len + rest_len + 1);
 	      memcpy (newp, home_dir, home_len);
 	      memcpy (&newp[home_len], end_name, rest_len);
 	      newp[home_len + rest_len] = '\0';
 	      dirname = newp;
 	    }
 	}
-#endif	/* Not Amiga && not Windows32.  */
+#endif	/* Not Amiga && not WINDOWS32.  */
    }
 #endif	/* Not VMS.  */

-  if (glob_pattern_p (dirname, !(flags & GLOB_NOESCAPE)))
+  if (__glob_pattern_p (dirname, !(flags & GLOB_NOESCAPE)))
    {
      /* The directory name contains metacharacters, so we
 	 have to glob for the directory, and then glob for
@@ -648,7 +650,7 @@ glob (pattern, flags, errfunc, pglob)
 	      {
 		globfree (&dirs);
 		globfree (&files);
-		return GLOB_ABEND;
+		return GLOB_ABORTED;
 	      }
 	  }
 #endif /* SHELL.  */
@@ -844,8 +846,8 @@ prefix_array (dirname, array, n)

 /* Return nonzero if PATTERN contains any metacharacters.
   Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
-static int
-glob_pattern_p (pattern, quote)
+int
+__glob_pattern_p (pattern, quote)
     const char *pattern;
     int quote;
 {
@@ -876,6 +878,9 @@ glob_pattern_p (pattern, quote)

  return 0;
 }
+#ifdef _LIBC
+weak_alias (__glob_pattern_p, glob_pattern_p)
+#endif


 /* Like `glob', but PATTERN is a final pathname component,
@@ -900,7 +905,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
  struct globlink *names = NULL;
  size_t nfound = 0;

-  if (!glob_pattern_p (pattern, !(flags & GLOB_NOESCAPE)))
+  if (!__glob_pattern_p (pattern, !(flags & GLOB_NOESCAPE)))
    {
      stream = NULL;
      flags |= GLOB_NOCHECK;
@@ -916,7 +921,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
 	{
 	  if ((errfunc != NULL && (*errfunc) (directory, errno)) ||
 	      (flags & GLOB_ERR))
-	    return GLOB_ABEND;
+	    return GLOB_ABORTED;
 	}
      else
 	while (1)
@@ -958,7 +963,7 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
    }

  if (nfound == 0 && (flags & GLOB_NOMAGIC) &&
-      ! glob_pattern_p (pattern, !(flags & GLOB_NOESCAPE)))
+      ! __glob_pattern_p (pattern, !(flags & GLOB_NOESCAPE)))
    flags |= GLOB_NOCHECK;

  if (nfound == 0 && (flags & GLOB_NOCHECK))
--- a/glob/glob.h
+++ b/glob/glob.h
@@ -1,7 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.  The master source lives in /gd/gnu/lib.
+/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.

   The GNU C Library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public License as
@@ -19,7 +16,6 @@
   Boston, MA 02111-1307, USA.  */

 #ifndef	_GLOB_H
-
 #define	_GLOB_H	1

 #ifdef	__cplusplus
@@ -28,17 +24,21 @@ extern "C"
 #endif

 #undef	__ptr_t
-#if (defined (__cplusplus) || (defined (__STDC__) && __STDC__) \
-     || defined (WINDOWS32))
-#undef	__P
-#define	__P(protos)	protos
-#define	__ptr_t	void *
+#if (defined __cplusplus || (defined __STDC__ && __STDC__) \
+     || defined WINDOWS32)
+# undef	__P
+# define __P(protos)	protos
+# define __ptr_t	void *
+# if !defined __GNUC__ || __GNUC__ < 2
+#  undef __const
+#  define __const const
+# endif
 #else /* Not C++ or ANSI C.  */
-#undef	__P
-#define	__P(protos)	()
-#undef	const
-#define	const
-#define	__ptr_t	char *
+# undef	__P
+# define __P(protos)	()
+# undef	__const
+# define __const
+# define __ptr_t	char *
 #endif /* C++ or ANSI C.  */

 /* Bits set in the FLAGS argument to `glob'.  */
@@ -50,26 +50,37 @@ extern "C"
 #define	GLOB_APPEND	(1 << 5)/* Append to results of a previous call.  */
 #define	GLOB_NOESCAPE	(1 << 6)/* Backslashes don't quote metacharacters.  */
 #define	GLOB_PERIOD	(1 << 7)/* Leading `.' can be matched by metachars.  */
-#define	__GLOB_FLAGS	(GLOB_ERR|GLOB_MARK|GLOB_NOSORT|GLOB_DOOFFS| \
+
+#if (!defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _BSD_SOURCE \
+     || defined _GNU_SOURCE)
+# define GLOB_MAGCHAR	 (1 << 8)/* Set in gl_flags if any metachars seen.  */
+# define GLOB_ALTDIRFUNC (1 << 9)/* Use gl_opendir et al functions.  */
+# define GLOB_BRACE	 (1 << 10)/* Expand "{a,b}" to "a" "b".  */
+# define GLOB_NOMAGIC	 (1 << 11)/* If no magic chars, return the pattern.  */
+# define GLOB_TILDE	 (1 <<12)/* Expand ~user and ~ to home directories.  */
+# define __GLOB_FLAGS	(GLOB_ERR|GLOB_MARK|GLOB_NOSORT|GLOB_DOOFFS| \
 			 GLOB_NOESCAPE|GLOB_NOCHECK|GLOB_APPEND|     \
 			 GLOB_PERIOD|GLOB_ALTDIRFUNC|GLOB_BRACE|     \
 			 GLOB_NOMAGIC|GLOB_TILDE)
-
-#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_BSD_SOURCE)
-#define	GLOB_MAGCHAR	(1 << 8)/* Set in gl_flags if any metachars seen.  */
-#define GLOB_ALTDIRFUNC	(1 << 9)/* Use gl_opendir et al functions.  */
-#define GLOB_BRACE	(1 << 10)/* Expand "{a,b}" to "a" "b".  */
-#define GLOB_NOMAGIC	(1 << 11)/* If no magic chars, return the pattern.  */
-#define GLOB_TILDE	(1 <<12)/* Expand ~user and ~ to home directories.  */
+#else
+# define __GLOB_FLAGS	(GLOB_ERR|GLOB_MARK|GLOB_NOSORT|GLOB_DOOFFS| \
+			 GLOB_NOESCAPE|GLOB_NOCHECK|GLOB_APPEND|     \
+			 GLOB_PERIOD)
 #endif

 /* Error returns from `glob'.  */
 #define	GLOB_NOSPACE	1	/* Ran out of memory.  */
-#define	GLOB_ABEND	2	/* Read error.  */
+#define	GLOB_ABORTED	2	/* Read error.  */
 #define	GLOB_NOMATCH	3	/* No matches found.  */

+#ifdef _GNU_SOURCE
+/* Previous versions of this file defined GLOB_ABEND instead of
+   GLOB_ABORTED.  Provide a compatibility definition here.  */
+# define GLOB_ABEND GLOB_ABORTED
+#endif
+
 /* Structure describing a globbing run.  */
-#if !defined (_AMIGA) && !defined (VMS) /* Buggy compiler.   */
+#if !defined _AMIGA && !defined VMS /* Buggy compiler.   */
 struct stat;
 #endif
 typedef struct
@@ -83,9 +94,9 @@ typedef struct
       are used instead of the normal file access functions.  */
    void (*gl_closedir) __P ((void *));
    struct dirent *(*gl_readdir) __P ((void *));
-    __ptr_t (*gl_opendir) __P ((const char *));
-    int (*gl_lstat) __P ((const char *, struct stat *));
-    int (*gl_stat) __P ((const char *, struct stat *));
+    __ptr_t (*gl_opendir) __P ((__const char *));
+    int (*gl_lstat) __P ((__const char *, struct stat *));
+    int (*gl_stat) __P ((__const char *, struct stat *));
  } glob_t;

 /* Do glob searching for PATTERN, placing results in PGLOB.
@@ -96,14 +107,24 @@ typedef struct
   `glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
   If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
   Otherwise, `glob' returns zero.  */
-extern int glob __P ((const char *__pattern, int __flags,
-		      int (*__errfunc) __P ((const char *, int)),
+extern int glob __P ((__const char *__pattern, int __flags,
+		      int (*__errfunc) __P ((__const char *, int)),
 		      glob_t *__pglob));

 /* Free storage allocated in PGLOB by a previous `glob' call.  */
 extern void globfree __P ((glob_t *__pglob));


+#ifdef _GNU_SOURCE
+/* Return nonzero if PATTERN contains any metacharacters.
+   Metacharacters can be quoted with backslashes if QUOTE is nonzero.
+
+   This function is not part of the interface specified by POSIX.2
+   but several programs want to use it.  */
+extern int __glob_pattern_p __P ((__const char *__pattern, int __quote));
+extern int glob_pattern_p __P ((__const char *__pattern, int __quote));
+#endif
+
 #ifdef	__cplusplus
 }
 #endif
--- a/implicit.c
+++ b/implicit.c
@@ -1,5 +1,5 @@
 /* Implicit rule searching 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,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
--- a/job.c
+++ b/job.c
@@ -1,6 +1,5 @@
 /* Job execution and handling for GNU Make.
-Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 96
-	Free Software Foundation, Inc.
+Copyright (C) 1988,89,90,91,92,93,94,95,96,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -785,6 +784,23 @@ start_job_command (child)
  message (0, (just_print_flag || (!(flags & COMMANDS_SILENT) && !silent_flag))
 	   ? "%s" : (char *) 0, p);

+  /* Optimize an empty command.  People use this for timestamp rules,
+     and forking a useless shell all the time leads to inefficiency. */
+
+  if (
+#ifdef __MSDOS__
+      unixy_shell	/* the test is complicated and we already did it */
+#else
+      (argv[0] && !strcmp(argv[0], "/bin/sh"))
+#endif
+      && (argv[1]   && !strcmp(argv[1], "-c"))
+      && (argv[2]   && !strcmp(argv[2], ":"))
+      && argv[3] == NULL)
+    {
+      set_command_state (child->file, cs_running);
+      goto next_command;
+    }
+
  /* Tell update_goal_chain that a command has been started on behalf of
     this target.  It is important that this happens here and not in
     reap_children (where we used to do it), because reap_children might be
@@ -1854,7 +1870,7 @@ construct_command_argv_internal (line, restp, shell, ifs)
 	  if (*p == instring)
 	    {
 	      instring = 0;
-	      if (*ap == '\0')
+	      if (ap == new_argv[0] || *(ap-1) == '\0')
 		last_argument_was_empty = 1;
 	    }
 	  else if (*p == '\\' && p[1] == '\n')
--- 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, 95, 96 Free Software Foundation, Inc.
+Copyright (C) 1988,89,90,91,94,95,96,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -392,6 +392,12 @@ struct file *default_file;
   This turns on pedantic compliance with POSIX.2.  */

 int posix_pedantic;
+
+/* Nonzero if some rule detected clock skew; we keep track so (a) we only
+   print one warning about it during the run, and (b) we can print a final
+   warning at the end of the run. */
+
+int clock_skew_detected;

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

@@ -1554,6 +1560,10 @@ int main (int argc, char ** argv)
 	  fatal ("No targets");
      }

+    /* If we detected some clock skew, generate one last warning */
+    if (clock_skew_detected)
+      error("*** Warning:  Clock skew detected.  Your build may be incomplete.");
+
    /* Exit.  */
    die (status);
  }
@@ -2314,7 +2324,7 @@ print_version ()
    printf ("-%s", remote_description);

  printf (", by Richard Stallman and Roland McGrath.\n\
-%sCopyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 96\n\
+%sCopyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 96, 97\n\
 %s\tFree Software Foundation, Inc.\n\
 %sThis is free software; see the source for copying conditions.\n\
 %sThere is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
--- a/51
+++ b/51
@@ -0,0 +1,51 @@
+# Maintainer-only makefile segment.  This contains things that are relevant
+# only if you have the full copy of the GNU make sources, not a dist copy.
+#
+
+# Find the glob source files... this might be dangerous, but we're maintainers!
+#
+globsrc := $(wildcard glob/*.c)
+globhdr := $(wildcard glob/*.h)
+
+TEMPLATES = README config.ami configh.dos config.h.W32 config.h-vms
+
+# General rule for turning a .template into a regular file.
+#
+$(TEMPLATES) : % : %.template configure.in
+	rm -f $@
+	sed -e 's@%VERSION%@$(VERSION)@' \
+	    -e 's@%PACKAGE%@$(PACKAGE)@' \
+	  $< > $@
+	chmod a-w $@
+
+# Construct Makefile.DOS
+#
+Makefile.DOS: Makefile.DOS.template Makefile.am configure.in
+	rm -f $@
+	sed -e 's@%VERSION%@$(VERSION)@' \
+	    -e 's@%PROGRAMS%@$(bin_PROGRAMS)@' \
+	    -e 's@%SOURCES%@$(filter-out remote-%,$(make_SOURCES)) remote-$$(REMOTE).c@' \
+	    -e 's@%OBJECTS%@$(filter-out remote-%,$(make_OBJECTS)) remote-$$(REMOTE).o@' \
+	    -e 's@%GLOB_SOURCES%@$(globsrc) $(globhdr)@' \
+	    -e 's@%GLOB_OBJECTS%@$(globsrc:glob/%.c=%.o)@' \
+	  $< > $@
+	chmod a-w $@
+
+# Construct build.sh.in
+#
+build.sh.in: build.template Makefile.am
+	rm -f $@
+	sed -e 's@%objs%@$(filter-out remote-%, $(make_OBJECTS)\
+	       $(patsubst %.c,%.o,$(globsrc)))@' \
+	    $< > $@
+	chmod a-w+x $@
+
+# Put the alpha distribution files up for anonymous FTP.
+#
+ALPHA	:= ~ftp/gnu
+TARFILE	:= $(distdir).tar.gz
+
+.PHONY: alpha
+alpha: $(ALPHA) $(TARFILE)
+	@rm -f $(ALPHA)/$(TARFILE)
+	cp -p $(TARFILE) $(ALPHA)
--- a/make.1
+++ b/make.1
@@ -8,7 +8,7 @@ make \- GNU make utility to maintain groups of programs
 makefile ] [ option ] ...
 target ...
 .SH WARNING
-This man paage is an extract of the documentation of
+This man page is an extract of the documentation of
 .I GNU make .
 It is updated only occasionally, because the GNU project does not use nroff.
 For complete, current documentation, refer to the Info file
@@ -110,7 +110,7 @@ or if the target does not exist.
 .B \-b
 .TP 0.5i
 .B \-m
-These options are ignored for compatibility with other versions of 
+These options are ignored for compatibility with other versions of
 .IR make .
 .TP 0.5i
 .BI "\-C " dir
@@ -157,7 +157,7 @@ If several
 .B \-I
 options are used to specify several directories, the directories are
 searched in the order specified.
-Unlike the arguments to other flags of 
+Unlike the arguments to other flags of
 .IR make ,
 directories given with
 .B \-I
@@ -236,11 +236,11 @@ Silent operation; do not print the commands as they are executed.
 Cancel the effect of the
 .B \-k
 option.
-This is never necessary except in a recursive 
+This is never necessary except in a recursive
 .I make
 where
 .B \-k
-might be inherited from the top-level 
+might be inherited from the top-level
 .I make
 via MAKEFLAGS or if you set
 .B \-k
@@ -254,7 +254,7 @@ future invocations of
 .IR make .
 .TP 0.5i
 .B \-v
-Print the version of the 
+Print the version of the
 .I make
 program plus a copyright, a list of authors and a notice that there
 is no warranty.
@@ -285,7 +285,7 @@ it is almost the same as running a
 .I touch
 command on the given file before running
 .IR make ,
-except that the modification time is changed only in the imagination of 
+except that the modification time is changed only in the imagination of
 .IR make .
 .SH "SEE ALSO"
 .PD 0
--- a/make.h
+++ b/make.h
@@ -1,5 +1,5 @@
 /* Miscellaneous global declarations and portability cruft for GNU Make.
-Copyright (C) 1988,89,90,91,92,93,94,95,96 Free Software Foundation, Inc.
+Copyright (C) 1988,89,90,91,92,93,94,95,96,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -72,7 +72,7 @@ extern int errno;
 #include <unistd.h>
 /* Ultrix's unistd.h always defines _POSIX_VERSION, but you only get
   POSIX.1 behavior with `cc -YPOSIX', which predefines POSIX itself!  */
-#if defined (_POSIX_VERSION) && !defined (ultrix)
+#if defined (_POSIX_VERSION) && !defined (ultrix) && !defined (VMS)
 #define	POSIX
 #endif
 #endif
@@ -293,8 +293,12 @@ extern char *alloca ();
 #if defined(__MSDOS__) || defined(WINDOWS32)
 #define PATH_SEPARATOR_CHAR ';'
 #else
+#if defined(VMS)
+#define PATH_SEPARATOR_CHAR ','
+#else
 #define PATH_SEPARATOR_CHAR ':'
 #endif
+#endif

 #ifdef WINDOWS32
 #include <fcntl.h>
@@ -376,7 +380,7 @@ extern void child_access ();
 #endif

 /* We omit these declarations on non-POSIX systems which define _POSIX_VERSION,
-   because such systems often declare the in header files anyway.  */
+   because such systems often declare them in header files anyway.  */

 #if !defined (__GNU_LIBRARY__) && !defined (POSIX) && !defined (_POSIX_VERSION) && !defined(WINDOWS32)

@@ -407,6 +411,7 @@ 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 int clock_skew_detected;

 extern unsigned int job_slots;
 #ifndef NO_FLOAT
--- a/make.texinfo
+++ b/make.texinfo
@@ -9,9 +9,9 @@

@set RCSID $Id$
@set EDITION 0.51
-@set VERSION 3.75 Beta
-@set UPDATED 9 May 1996
-@set UPDATE-MONTH May 1996
+@set VERSION 3.76 Beta
+@set UPDATED 26 Aug 1997
+@set UPDATE-MONTH Aug 1997
@comment The ISBN number might need to change on next publication.
@set ISBN 1-882114-78-7 @c CHANGE THIS BEFORE PRINTING AGAIN! --roland 9may96

@@ -37,7 +37,7 @@ and issues the commands to recompile them.
 This is Edition @value{EDITION}, last updated @value{UPDATED},
 of @cite{The GNU Make Manual}, for @code{make}, Version @value{VERSION}.

-Copyright (C) 1988, '89, '90, '91, '92, '93, '94, '95, '96
+Copyright (C) 1988, '89, '90, '91, '92, '93, '94, '95, '96, '97
 	Free Software Foundation, Inc.

 Permission is granted to make and distribute verbatim copies of
@@ -73,7 +73,7 @@ by the Free Software Foundation.
@author Richard M. Stallman and Roland McGrath
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 1988, '89, '90, '91, '92, '93, '94, '95, '96 Free Software Foundation, Inc.
+Copyright @copyright{} 1988, '89, '90, '91, '92, '93, '94, '95, '96, '97 Free Software Foundation, Inc.
@sp 2
 Published by the Free Software Foundation @*
 59 Temple Place -- Suite 330, @*
@@ -264,7 +264,7 @@ Functions for Transforming Text

 * Syntax of Functions::         How to write a function call.
 * Text Functions::              General-purpose text manipulation functions.
-* Filename Functions::          Functions for manipulating file names.
+* File Name Functions::         Functions for manipulating file names.
 * Foreach Function::            Repeat some text with controlled variation.
 * Origin Function::             Find where a variable got its value.
 * Shell Function::              Substitute the output of a shell command.
@@ -1102,6 +1102,8 @@ makefile as has been traditionally done with other versions of

@cindex @code{-I}
@cindex @code{--include-dir}
+@cindex included makefiles, default directries
+@cindex default directries for included makefiles
@findex /usr/gnu/include
@findex /usr/local/include
@findex /usr/include
@@ -1112,7 +1114,10 @@ First, any directories you have specified with the @samp{-I} or
 (@pxref{Options Summary, ,Summary of Options}).
 Then the following directories (if they exist)
 are searched, in this order:
-@file{@var{prefix}/include} (normally @file{/usr/local/include})
+@file{@var{prefix}/include} (normally @file{/usr/local/include}
+@footnote{GNU Make compiled for MS-DOS and MS-Windows behaves as if
+@var{prefix} has been defined to be the root of the DJGPP tree
+hierarchy.})
@file{/usr/gnu/include},
@file{/usr/local/include}, @file{/usr/include}.

@@ -1464,7 +1469,10 @@ significance.  If alone, or followed by a slash, it represents your home
 directory.  For example @file{~/bin} expands to @file{/home/you/bin}.
 If the @samp{~} is followed by a word, the string represents the home
 directory of the user named by that word.  For example @file{~john/bin}
-expands to @file{/home/john/bin}.@refill
+expands to @file{/home/john/bin}.  On systems which don't have a home
+directory for each user (such as MS-DOS or MS-Windows), this
+functionality can be simulated by setting the environment variable
+@var{HOME}.@refill

 Wildcard expansion happens automatically in targets, in dependencies,
 and in commands (where the shell does the expansion).  In other
@@ -1578,6 +1586,24 @@ expansion, but you need more sophisticated techniques, including the
 These are described in the following section.
@end iftex

+@cindex wildcards and MS-DOS/MS-Windows backslashes
+@cindex backslashes in pathnames and wildcard expansion
+
+Microsoft operating systems (MS-DOS and MS-Windows) use backslashes to
+separate directories in pathnames, like so:
+
+@example
+  c:\foo\bar\baz.c
+@end example
+
+This is equivalent to the Unix-style @file{c:/foo/bar/baz.c} (the
+@file{c:} part is the so-called drive letter).  When @code{make} runs on
+these systems, it supports backslashes as well as the Unix-style forward
+slashes in pathnames.  However, this support does @emph{not} include the
+wildcard expansion, where backslash is a quote character.  Therefore,
+you @emph{must} use Unix-style slashes in these cases.
+
+
@node Wildcard Function,  , Wildcard Pitfall, Wildcards
@subsection The Function @code{wildcard}
@findex wildcard
@@ -1676,13 +1702,15 @@ Thus, if a file that is listed as a target or dependency does not exist
 in the current directory, @code{make} searches the directories listed in
@code{VPATH} for a file with that name.  If a file is found in one of
 them, that file may become the dependency (see below).  Rules may then
-specify the names of source files in the dependencies as if they all
+specify the names of files in the dependency list as if they all
 existed in the current directory.  @xref{Commands/Search, ,Writing Shell
 Commands with Directory Search}.

 In the @code{VPATH} variable, directory names are separated by colons or
 blanks.  The order in which directories are listed is the order followed
-by @code{make} in its search.
+by @code{make} in its search.  (On MS-DOS and MS-Windows, semi-colons
+are used as separators of directory names in @code{VPATH}, since the
+colon can be used in the pathname itself, after the drive letter.)

 For example,

@@ -1715,11 +1743,12 @@ is found in the directory @file{src}.
@subsection The @code{vpath} Directive
@findex vpath

-Similar to the @code{VPATH} variable but more selective is the @code{vpath}
-directive (note lower case), which allows you to specify a search path for a particular class
-of file names, those that match a particular pattern.  Thus you can supply
-certain search directories for one class of file names and other directories
-(or none) for other file names.
+Similar to the @code{VPATH} variable, but more selective, is the
+@code{vpath} directive (note lower case), which allows you to specify a
+search path for a particular class of file names: those that match a
+particular pattern.  Thus you can supply certain search directories for
+one class of file names and other directories (or none) for other file
+names.

 There are three forms of the @code{vpath} directive:

@@ -1729,8 +1758,8 @@ Specify the search path @var{directories} for file names that match
@var{pattern}.

 The search path, @var{directories}, is a list of directories to be
-searched, separated by colons or blanks, just like the search path used
-in the @code{VPATH} variable.
+searched, separated by colons (semi-colons on MS-DOS and MS-Windows) or
+blanks, just like the search path used in the @code{VPATH} variable.

@item vpath @var{pattern}
 Clear out the search path associated with @var{pattern}.
@@ -1817,7 +1846,7 @@ will look for a file ending in @samp{.c} in @file{foo}, then

 When a dependency is found through directory search, regardless of type
 (general or selective), the pathname located may not be the one that
-@code{make} actually provides you in the dependency list.  Sometimes,
+@code{make} actually provides you in the dependency list.  Sometimes
 the path discovered through directory search is thrown away.

 The algorithm @code{make} uses to decide whether to keep or abandon a
@@ -1829,7 +1858,7 @@ If a target file does not exist at the path specified in the makefile,
 directory search is performed.

@item
-If the directory search is successful that path is kept, and this file
+If the directory search is successful, that path is kept and this file
 is tentatively stored as the target.

@item
@@ -1843,17 +1872,20 @@ rebuilt:
@item
 If the target does @emph{not} need to be rebuilt, the path to the file
 found during directory search is used for any dependency lists which
-contain this target.
+contain this target.  In short, if @code{make} doesn't need to rebuild
+the target then you use the path found via directory search.

@item
 If the target @emph{does} need to be rebuilt (is out-of-date), the
 pathname found during directory search is @emph{thrown away}, and the
-target is rebuilt using the filename specified in the makefile.
+target is rebuilt using the file name specified in the makefile.  In
+short, if @code{make} must rebuild, then the target is rebuilt locally,
+not in the directory found via directory search.
@end enumerate
@end enumerate

-This may seem overly complex, but in fact it is almost always exactly
-what you want.
+This algorithm may seem complex, but in practice it is quite often
+exactly what you want.

@cindex traditional directory search
@cindex directory search, traditional
@@ -1958,7 +1990,9 @@ handles it specially by searching for the file @file{lib@var{name}.a} in
 the current directory, in directories specified by matching @code{vpath}
 search paths and the @code{VPATH} search path, and then in the
 directories @file{/lib}, @file{/usr/lib}, and @file{@var{prefix}/lib}
-(normally @file{/usr/local/lib}).
+(normally @file{/usr/local/lib}, but MS-DOS/MS-Windows versions of
+@code{make} behave as if @var{prefix} is defined to be the root of the
+DJGPP installation tree).

 For example,

@@ -2834,13 +2868,15 @@ by making a new subshell for each line.  (In practice, @code{make} may
 take shortcuts that do not affect the results.)

@cindex @code{cd} (shell command)
-@strong{Please note:} this implies that shell commands such as
-@code{cd} that set variables local to each process will not affect the
-following command lines.  If you want to use @code{cd} to affect the
-next command, put the two on a single line with a semicolon between
-them.  Then @code{make} will consider them a single command and pass
-them, together, to a shell which will execute them in sequence.  For
-example:
+@strong{Please note:} this implies that shell commands such as @code{cd}
+that set variables local to each process will not affect the following
+command lines. @footnote{On MS-DOS, the value of current working
+directory is @strong{global}, so changing it @emph{will} affect the
+following command lines on those systems.}  If you want to use @code{cd}
+to affect the next command, put the two on a single line with a
+semicolon between them.  Then @code{make} will consider them a single
+command and pass them, together, to a shell which will execute them in
+sequence.  For example:

@example
 foo : bar/lose
@@ -2871,13 +2907,75 @@ foo : bar/lose
 The program used as the shell is taken from the variable @code{SHELL}.
 By default, the program @file{/bin/sh} is used.

+@vindex COMSPEC
+On MS-DOS, if @code{SHELL} is not set, the value of the variable
+@code{COMSPEC} (which is always set) is used instead.
+
+@cindex @code{SHELL}, MS-DOS specifics
+The processing of lines that set the variable @code{SHELL} in Makefiles
+is different on MS-DOS.  The stock shell, @file{command.com}, is
+ridiculously limited in its functionality and many users of @code{make}
+tend to install a replacement shell.  Therefore, on MS-DOS, @code{make}
+examines the value of @code{SHELL}, and changes its behavior based on
+whether it points to a Unix-style or DOS-style shell.  This allows
+reasonable functionality even if @code{SHELL} points to
+@file{command.com}.
+
+If @code{SHELL} points to a Unix-style shell, @code{make} on MS-DOS
+additionally checks whether that shell can indeed be found; if not, it
+ignores the line that sets @code{SHELL}.  In MS-DOS, GNU @code{make}
+searches for the shell in the following places:
+
+@enumerate
+@item
+In the precise place pointed to by the value of @code{SHELL}.  For
+example, if the makefile specifies @samp{SHELL = /bin/sh}, @code{make}
+will look in the directory @file{/bin} on the current drive.
+
+@item
+In the current directory.
+
+@item
+In each of the directories in the @code{PATH} variable, in order.
+
+@end enumerate
+
+In every directory it examines, @code{make} will first look for the
+specific file (@file{sh} in the example above).  If this is not found,
+it will also look in that directory for that file with one of the known
+extensions which identify executable files.  For example @file{.exe},
+@file{.com}, @file{.bat}, @file{.btm}, @file{.sh}, and some others.
+
+If any of these attempts is successful, the value of @code{SHELL} will
+be set to the full pathname of the shell as found.  However, if none of
+these is found, the value of @code{SHELL} will not be changed, and thus
+the line that sets it will be effectively ignored.  This is so
+@code{make} will only support features specific to a Unix-style shell if
+such a shell is actually installed on the system where @code{make} runs.
+
+Note that this extended search for the shell is limited to the cases
+where @code{SHELL} is set from the Makefile; if it is set in the
+environment or command line, you are expected to set it to the full
+pathname of the shell, exactly as things are on Unix.
+
+The effect of the above DOS-specific processing is that a Makefile that
+says @samp{SHELL = /bin/sh} (as many Unix makefiles do), will work
+on MS-DOS unaltered if you have e.g. @file{sh.exe} installed in some
+directory along your @code{PATH}.
+
@cindex environment, @code{SHELL} in
 Unlike most variables, the variable @code{SHELL} is never set from the
 environment.  This is because the @code{SHELL} environment variable is
 used to specify your personal choice of shell program for interactive
-use.  It would be very bad for personal choices like this to affect
-the functioning of makefiles.  @xref{Environment, ,Variables from the
-Environment}.
+use.  It would be very bad for personal choices like this to affect the
+functioning of makefiles.  @xref{Environment, ,Variables from the
+Environment}.  However, on MS-DOS and MS-Windows the value of
+@code{SHELL} in the environment @strong{is} used, since on those systems
+most users do not set this variable, and therefore it is most likely set
+specifically to be used by @code{make}.  On MS-DOS, if the setting of
+@code{SHELL} is not suitable for @code{make}, you can set the variable
+@code{MAKESHELL} to the shell that @code{make} should use; this will
+override the value of @code{SHELL}.

@node Parallel, Errors, Execution, Commands
@section Parallel Execution
@@ -2894,6 +2992,9 @@ for it to finish before executing the next.  However, the @samp{-j} or
@samp{--jobs} option tells @code{make} to execute many commands
 simultaneously.@refill

+On MS-DOS, the @samp{-j} option has no effect, since that system doesn't
+support multi-processing.
+
 If the @samp{-j} option is followed by an integer, this is the number of
 commands to execute at once; this is called the number of @dfn{job slots}.
 If there is nothing looking like an integer after the @samp{-j} option,
@@ -3110,7 +3211,7 @@ subdirectory.  You can do it by writing this:

@example
 subsystem:
-        cd subdir; $(MAKE)
+        cd subdir && $(MAKE)
@end example

@noindent
@@ -3146,13 +3247,13 @@ not the explicit command name @samp{make}, as shown here:
@example
@group
 subsystem:
-        cd subdir; $(MAKE)
+        cd subdir && $(MAKE)
@end group
@end example

 The value of this variable is the file name with which @code{make} was
 invoked.  If this file name was @file{/bin/make}, then the command executed
-is @samp{cd subdir; /bin/make}.  If you use a special version of
+is @samp{cd subdir && /bin/make}.  If you use a special version of
@code{make} to run the top-level makefile, the same special version will be
 executed for recursive invocations.
@cindex @code{cd} (shell command)
@@ -3169,7 +3270,7 @@ Consider the command @samp{make -t} in the above example.  (The
 any commands; see @ref{Instead of Execution}.)  Following the usual
 definition of @samp{-t}, a @samp{make -t} command in the example would
 create a file named @file{subsystem} and do nothing else.  What you
-really want it to do is run @samp{@w{cd subdir;} @w{make -t}}; but that would
+really want it to do is run @samp{@w{cd subdir &&} @w{make -t}}; but that would
 require executing the command, and @samp{-t} says not to execute
 commands.@refill
@cindex @code{-t}, and recursion
@@ -3420,7 +3521,7 @@ value of @code{MAKEFLAGS}, like this:

@example
 subsystem:
-        cd subdir; $(MAKE) MAKEFLAGS=
+        cd subdir && $(MAKE) MAKEFLAGS=
@end example

@vindex MAKEOVERRIDES
@@ -3459,7 +3560,7 @@ this:

@example
 subsystem:
-        cd subdir; $(MAKE) $(MFLAGS)
+        cd subdir && $(MAKE) $(MFLAGS)
@end example

@noindent
@@ -4585,7 +4686,9 @@ Such problems would be especially likely with the variable @code{SHELL},
 which is normally present in the environment to specify the user's choice
 of interactive shell.  It would be very undesirable for this choice to
 affect @code{make}.  So @code{make} ignores the environment value of
-@code{SHELL}.@refill
+@code{SHELL} (except on MS-DOS and MS-Windows, where @code{SHELL} is
+usually not set.  @xref{Execution, ,Special handling of SHELL on
+MS-DOS}.)@refill

@node Conditionals, Functions, Using Variables, Top
@chapter Conditional Parts of Makefiles
@@ -4882,7 +4985,7 @@ call, just as a variable might be substituted.
@menu
 * Syntax of Functions::         How to write a function call.
 * Text Functions::              General-purpose text manipulation functions.
-* Filename Functions::          Functions for manipulating file names.
+* File Name Functions::         Functions for manipulating file names.
 * Foreach Function::            Repeat some text with controlled variation.
 * Origin Function::             Find where a variable got its value.
 * Shell Function::              Substitute the output of a shell command.
@@ -4951,7 +5054,7 @@ bar:= $(subst $(space),$(comma),$(foo))
 Here the @code{subst} function replaces each space with a comma, through
 the value of @code{foo}, and substitutes the result.

-@node Text Functions, Filename Functions, Syntax of Functions, Functions
+@node Text Functions, File Name Functions, Syntax of Functions, Functions
@section Functions for String Substitution and Analysis
@cindex functions, for text

@@ -5215,7 +5318,7 @@ used so that the new value is assigned even if the previous value of
@code{CFLAGS} was specified with a command argument (@pxref{Override
 Directive, , The @code{override} Directive}).

-@node Filename Functions, Foreach Function, Text Functions, Functions
+@node File Name Functions, Foreach Function, Text Functions, Functions
@section Functions for File Names
@cindex functions, for file names
@cindex file name functions
@@ -5282,11 +5385,11 @@ file names.
 For example,

@example
-$(suffix src/foo.c hacks)
+$(suffix src/foo.c src-1.0/bar.c hacks)
@end example

@noindent
-produces the result @samp{.c}.
+produces the result @samp{.c .c}.

@item $(basename @var{names}@dots{})
@findex basename
@@ -5294,15 +5397,16 @@ produces the result @samp{.c}.
@cindex file name, basename of
 Extracts all but the suffix of each file name in @var{names}.  If the
 file name contains a period, the basename is everything starting up to
-(and not including) the last period.  Otherwise, the basename is the
-entire file name.  For example,
+(and not including) the last period.  Periods in the directory part are
+ignored.  If there is no period, the basename is the entire file name.
+For example,

@example
-$(basename src/foo.c hacks)
+$(basename src/foo.c src-1.0/bar hacks)
@end example

@noindent
-produces the result @samp{src/foo hacks}.
+produces the result @samp{src/foo src-1.0/bar hacks}.

@c plural convention with dots (be consistent)
@item $(addsuffix @var{suffix},@var{names}@dots{})
@@ -5429,7 +5533,7 @@ that match the pattern.
@xref{Wildcards, ,Using Wildcard Characters in File Names}.
@end table

-@node Foreach Function, Origin Function, Filename Functions, Functions
+@node Foreach Function, Origin Function, File Name Functions, Functions
@section The @code{foreach} Function
@findex foreach
@cindex words, iterating over
@@ -6197,6 +6301,7 @@ argument, @code{make} runs as many jobs simultaneously as possible.  If
 there is more than one @samp{-j} option, the last one is effective.
@xref{Parallel, ,Parallel Execution},
 for more information on how commands are run.
+Note that this option is ignored on MS-DOS.

@item -k
@cindex @code{-k}
@@ -7355,7 +7460,7 @@ variants that get just the file's directory name or just the file name
 within the directory.  The variant variables' names are formed by
 appending @samp{D} or @samp{F}, respectively.  These variants are
 semi-obsolete in GNU @code{make} since the functions @code{dir} and
-@code{notdir} can be used to get a similar effect (@pxref{Filename
+@code{notdir} can be used to get a similar effect (@pxref{File Name
 Functions, , Functions for File Names}).  Note, however, that the
@samp{F} variants all omit the trailing slash which always appears in
 the output of the @code{dir} function.  Here is a table of the variants:
@@ -8529,43 +8634,43 @@ Sort the words in @var{list} lexicographically, removing duplicates.@*

@item $(dir @var{names}@dots{})
 Extract the directory part of each file name.@*
-@xref{Filename Functions, ,Functions for File Names}.
+@xref{File Name Functions, ,Functions for File Names}.

@item $(notdir @var{names}@dots{})
 Extract the non-directory part of each file name.@*
-@xref{Filename Functions, ,Functions for File Names}.
+@xref{File Name Functions, ,Functions for File Names}.

@item $(suffix @var{names}@dots{})
 Extract the suffix (the last @samp{.} and following characters) of each file name.@*
-@xref{Filename Functions, ,Functions for File Names}.
+@xref{File Name Functions, ,Functions for File Names}.

@item $(basename @var{names}@dots{})
 Extract the base name (name without suffix) of each file name.@*
-@xref{Filename Functions, ,Functions for File Names}.
+@xref{File Name Functions, ,Functions for File Names}.

@item $(addsuffix @var{suffix},@var{names}@dots{})
 Append @var{suffix} to each word in @var{names}.@*
-@xref{Filename Functions, ,Functions for File Names}.
+@xref{File Name Functions, ,Functions for File Names}.

@item $(addprefix @var{prefix},@var{names}@dots{})
 Prepend @var{prefix} to each word in @var{names}.@*
-@xref{Filename Functions, ,Functions for File Names}.
+@xref{File Name Functions, ,Functions for File Names}.

@item $(join @var{list1},@var{list2})
 Join two parallel lists of words.@*
-@xref{Filename Functions, ,Functions for File Names}.
+@xref{File Name Functions, ,Functions for File Names}.

@item $(word @var{n},@var{text})
 Extract the @var{n}th word (one-origin) of @var{text}.@*
-@xref{Filename Functions, ,Functions for File Names}.
+@xref{File Name Functions, ,Functions for File Names}.

@item $(words @var{text})
 Count the number of words in @var{text}.@*
-@xref{Filename Functions, ,Functions for File Names}.
+@xref{File Name Functions, ,Functions for File Names}.

@item $(firstword @var{names}@dots{})
 Extract the first word of @var{names}.@*
-@xref{Filename Functions, ,Functions for File Names}.
+@xref{File Name Functions, ,Functions for File Names}.

@item $(wildcard @var{pattern}@dots{})
 Find file names matching a shell file name pattern (@emph{not} a
@@ -8669,6 +8774,12 @@ The name of the system default command interpreter, usually @file{/bin/sh}.
 You can set @code{SHELL} in the makefile to change the shell used to run
 commands.  @xref{Execution, ,Command Execution}.

+@item MAKESHELL
+
+On MS-DOS only, the name of the command interpreter that is to be used
+by @code{make}. This value takes precedence over the value of
+@code{SHELL}.  @xref{Execution, ,MAKESHELL variable}.
+
@item MAKE

 The name with which @code{make} was invoked.
--- a/makefile.com
+++ b/makefile.com
@@ -5,7 +5,7 @@ $! P1 is non-empty if you want to link with the VAXCRTL library instead
 $!    of the shareable executable
 $!
 $ def/nolog sys sys$library:
-$ filelist = "alloca commands default dir expand file function implicit job main misc read remake remote-stub rule signame variable version vmsfunctions vmsify vpath [.glob]glob [.glob]fnmatch getopt getopt1"
+$ filelist = "alloca ar arscan commands default dir expand file function implicit job main misc read remake remote-stub rule signame variable version vmsfunctions vmsify vpath [.glob]glob [.glob]fnmatch getopt getopt1"
 $ copy config.h-vms config.h
 $ n=0
 $ loop:
@@ -17,18 +17,18 @@ $ n = n + 1
 $ goto loop
 $ linkit:
 $ if p1 .nes. "" then goto link_using_library
-$ link/exe=make alloca,commands,default,dir,expand,file,function,-
+$ link/exe=make alloca,ar,arscan,commands,default,dir,expand,file,function,-
 		implicit,job,main,misc,read,remake,remote-stub,rule,-
 		signame,variable,version,vmsfunctions,vmsify,vpath,-
 		glob,fnmatch,getopt,getopt1
 $ exit
 $ link_using_library:
-$ link/exe=make alloca,commands,default,dir,expand,file,function,-
+$ link/exe=make alloca,ar,arscan,commands,default,dir,expand,file,function,-
 		implicit,job,main,misc,read,remake,remote-stub,rule,-
 		signame,variable,version,vmsfunctions,vmsify,vpath,-
 		glob,fnmatch,getopt,getopt1,sys$library:vaxcrtl/lib
 $!
 $ compileit : subroutine
-$ cc/include=([],[.glob])/define=("allocated_variable_expand_for_file=alloc_var_expand_for_file","unlink=remove","HAVE_CONFIG_H","VMS","NO_ARCHIVES") 'p1'
+$ cc/include=([],[.glob])/define=("allocated_variable_expand_for_file=alloc_var_expand_for_file","unlink=remove","HAVE_CONFIG_H","VMS") 'p1'
 $ exit
 $ endsubroutine : compileit
--- a/makefile.vms
+++ b/makefile.vms
@@ -1,4 +1,4 @@
-# Copyright (C) 1988, 1989, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1988, 1989, 1996, 1997 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 #
 # VMS extensions from GNU Make 3.60 imported by
@@ -31,13 +31,13 @@ CFLAGS = $(defines) /debug/noopt/include=([],[.glob])
 #LDFLAGS = /deb
 LDFLAGS =

-defines = /define=("unlink=remove","HAVE_CONFIG_H","VMS","NO_ARCHIVES","allocated_variable_expand_for_file=alloc_var_expand_for_file")
+defines = /define=("unlink=remove","HAVE_CONFIG_H","VMS","allocated_variable_expand_for_file=alloc_var_expand_for_file")

 LOAD_AVG = /define="NO_LDAV"

 # If you don't want archive support, comment these out.
-#ARCHIVES = ,ar.obj,arscan.obj
-#ARCHIVES_SRC = ar.c arscan.c
+ARCHIVES = ,ar.obj,arscan.obj
+ARCHIVES_SRC = ar.c arscan.c

 # If your system needs extra libraries loaded in, define them here.
 # System V probably need -lPW for alloca.
--- a/misc.c
+++ b/misc.c
@@ -1,5 +1,5 @@
 /* Miscellaneous generic support functions for GNU Make.
-Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
+Copyright (C) 1988,89,90,91,92,93,94,95,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
--- a/read.c
+++ b/read.c
@@ -1,5 +1,5 @@
 /* Reading and parsing of makefiles for GNU Make.
-Copyright (C) 1988,89,90,91,92,93,94,95,96 Free Software Foundation, Inc.
+Copyright (C) 1988,89,90,91,92,93,94,95,96,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -474,7 +474,7 @@ read_makefile (filename, flags)
        ++p2;
      if (*p2 == '\0')
        p2 = NULL;
-      else if (*p2 == ':')
+      else if (p2[0] == ':' && p2[1] == '\0')
        goto check_var;

      /* We must first check for conditional and `define' directives before
@@ -907,13 +907,17 @@ do_define (name, namelen, origin, lineno, infile, filename)
  initbuffer (&lb);
  while (!feof (infile))
    {
+      unsigned int len;
+
      lineno += nlines;
      nlines = readline (&lb, infile, filename, lineno);

      collapse_continuations (lb.buffer);

      p = next_token (lb.buffer);
-      if ((p[5] == '\0' || isblank (p[5])) && !strncmp (p, "endef", 5))
+      len = strlen (p);
+      if ((len == 5 || (len > 5 && isblank (p[5])))
+          && !strncmp (p, "endef", 5))
 	{
 	  p += 5;
 	  remove_comments (p);
@@ -928,12 +932,11 @@ do_define (name, namelen, origin, lineno, infile, filename)
 	  (void) define_variable (var, strlen (var), definition, origin, 1);
 	  free (definition);
 	  freebuffer (&lb);
-	  return lineno;
+	  return (lineno + nlines);
 	}
      else
 	{
-	  unsigned int len = strlen (lb.buffer);
-
+          len = strlen (lb.buffer);
 	  /* Increase the buffer size if necessary.  */
 	  if (idx + len + 1 > length)
 	    {
--- a/readme.vms
+++ b/readme.vms
@@ -1,14 +1,14 @@
-This is the VMS port of GNU Make version 3.75.
+This is the VMS port of GNU Make.

 It is based on the VMS port of GNU Make 3.60 by Mike Moretti.

-This port was done by Klaus Kämpf (kkaempf@progis.de) of
-proGIS Software, Aachen, Germany
+This port was done by Klaus Kämpf <kkaempf@progis.de> of
+proGIS Software, Aachen, Germany.

 To build Make, simply type @makefile.  This should compile all the
-necessary files and link Make.
-There is also a file called makefile.vms.  If you already have GNU
-Make 3.74 built you can just use Make with this makefile to rebuild.
+necessary files and link Make.  There is also a file called
+makefile.vms.  If you already have GNU Make built you can just use
+Make with this makefile to rebuild.

 Here are some notes about GNU Make for VMS:

--- 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,95,96 Free Software Foundation, Inc.
+Copyright (C) 1988,89,90,91,92,93,94,95,96,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -56,10 +56,6 @@ static int library_search PARAMS ((char **lib, time_t *mtime_ptr));

 extern time_t f_mtime PARAMS ((struct file *file, int search));

-#ifdef VMS
-extern int vms_stat PARAMS ((char *name, struct stat *buf));
-#endif
-

 /* Remake all the goals in the `struct dep' chain GOALS.  Return -1 if nothing
   was done, 0 if all goals were updated successfully, or 1 if a goal failed.
@@ -597,34 +593,17 @@ update_file_1 (file, depth)

  DEBUGPR ("Must remake target `%s'.\n");

-  /* It needs to be remade.  If it's VPATH and not GPATH, toss the VPATH */
+  /* It needs to be remade.  If it's VPATH and not reset via GPATH, toss the
+     VPATH */
  if (!streq(file->name, file->hname))
    {
-      char *name = file->name;
-
-      if (gpath_search (&name, NULL))
+      if (debug_flag)
        {
-          register struct file *fp = file;
-
-          /* Since we found the file on GPATH, convert it to use the
-             VPATH filename. */
-          while (fp)
-            {
-              fp->name = fp->hname;
-              fp = fp->prev;
-            }
-          DEBUGPR ("  Using VPATH `%s' due to GPATH.\n");
-        }
-      else
-        {
-          if (debug_flag)
-            {
-              print_spaces (depth);
-              printf("  Ignoring VPATH name `%s'.\n", file->hname);
-              fflush(stdout);
-            }
-          file->ignore_vpath = 1;
+          print_spaces (depth);
+          printf("  Ignoring VPATH name `%s'.\n", file->hname);
+          fflush(stdout);
        }
+      file->ignore_vpath = 1;
    }

  /* Now, take appropriate actions to remake the file.  */
@@ -799,7 +778,7 @@ check_dep (file, depth, this_mtime, must_make_ptr)
      check_renamed (file);
      mtime = file_mtime (file);
      check_renamed (file);
-      if (mtime > this_mtime)
+      if (mtime != (time_t) -1 && mtime > this_mtime)
 	*must_make_ptr = 1;
 	  /* Otherwise, update all non-intermediate files we depend on,
 	     if necessary, and see whether any of them is more
@@ -1070,6 +1049,17 @@ f_mtime (file, search)
 		/* vpath_search and library_search store zero in MTIME
 		   if they didn't need to do a stat call for their work.  */
 		file->last_mtime = mtime;
+
+              /* If we found it in VPATH, see if it's in GPATH too; if so,
+                 change the name right now; if not, defer until after the
+                 dependencies are updated. */
+              if (gpath_search (name, strlen(name) - strlen(file->name) - 1))
+                {
+                  rename_file (file, name);
+                  check_renamed (file);
+                  return file_mtime (file);
+                }
+
 	      rehash_file (file, name);
 	      check_renamed (file);
 	      mtime = name_mtime (name);
@@ -1080,25 +1070,39 @@ f_mtime (file, search)
  {
    /* Files can have bogus timestamps that nothing newly made will be
       "newer" than.  Updating their dependents could just result in loops.
-       So notify the user of the anomaly with a warning.  */
+       So notify the user of the anomaly with a warning.
+
+       We only need to do this once, for now. */

    static time_t now = 0;
-    if (mtime != -1 && mtime > now && ! file->updated)
+    if (!clock_skew_detected
+        && mtime != (time_t)-1 && mtime > now
+        && !file->updated)
      {
 	/* This file's time appears to be in the future.
 	   Update our concept of the present, and compare again.  */
-#ifdef VMS
-	/* Handle vms 64bit to 32bit time hack introduced in vms_stat ... */
-	static unsigned long vms_now[2]; /* assumes 32 bit long ! */
-	sys$gettim (vms_now);
-	now = ((vms_now[0]>>24) & 0xff) + ((vms_now[1]<<8) & 0xffffff00);
-#else
+
 	extern time_t time ();
 	time (&now);
+
+#ifdef WINDOWS32
+	/*
+	 * FAT filesystems round time to nearest even second(!). Just
+	 * allow for any file (NTFS or FAT) to perhaps suffer from this
+	 * braindamage.
+	 *
+	 * Apparently, this doesn't happen with the MS-DOS/DJGPP port,
+	 * although MS-DOS and MS-Windows 3.X/9X also use FAT filesystems.
+	 */
+	if (mtime > now && (((mtime % 2) == 0) && ((mtime-1) > now)))
+#else
+        if (mtime > now)
 #endif
-	if (mtime > now)
-          error ("*** Warning: File `%s' has modification time in the future",
-                 file->name);
+          {
+            error("*** Warning: File `%s' has modification time in the future",
+                  file->name);
+            clock_skew_detected = 1;
+          }
      }
  }

@@ -1123,11 +1127,7 @@ name_mtime (name)
 {
  struct stat st;

-#ifdef VMS
-  if (vms_stat (name, &st) < 0)
-#else
  if (stat (name, &st) < 0)
-#endif
    return (time_t) -1;

  return (time_t) st.st_mtime;
--- a/variable.c
+++ b/variable.c
@@ -1,5 +1,5 @@
 /* Internals of variables for GNU Make.
-Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 96 Free Software Foundation, Inc.
+Copyright (C) 1988,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -333,8 +333,6 @@ merge_variable_set_lists (setlist0, setlist1)

      merge_variable_sets (list0->set, next->set);

-      free ((char *) next);
-
      last0 = list0;
      list0 = list0->next;
    }
--- a/version.c
+++ b/version.c
@@ -1,4 +1,9 @@
-char *version_string = "3.75.1";
+/* 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 make.h was found in $srcdir).  */
+#include <config.h>
+
+char *version_string = VERSION;

 /*
  Local variables:
--- a/vmsdir.h
+++ b/vmsdir.h
@@ -4,8 +4,10 @@

 #define	MAXNAMLEN	255

+#ifndef __DECC
 typedef unsigned long u_long;
 typedef unsigned short u_short;
+#endif

 struct	direct {
  off_t d_off;
--- a/vmsify.c
+++ b/vmsify.c
@@ -330,9 +330,9 @@ vmsify (name, type)
 		else
 		  {
 		    strcpy (vptr, "[.");
-		    nstate = N_DOT;
 		    vptr += 2;
 		    copyto (&vptr, &fptr, '/', 1);
+		    nstate = N_OPEN;
 		    state = 9;
 		  }
 	      }
@@ -738,6 +738,7 @@ vmsify (name, type)
 	      s = strchr (vptr, ']');
 	      if (s != 0)
 		{
+		  nstate = N_OPEN;
 		  while (s > vptr)
 		    {
 		      s--;
--- a/vpath.c
+++ b/vpath.c
@@ -1,5 +1,5 @@
 /* Implementation of pattern-matching file search paths for GNU Make.
-Copyright (C) 1988, 89, 91, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+Copyright (C) 1988,89,91,92,93,94,95,96,97 Free Software Foundation, Inc.
 This file is part of GNU Make.

 GNU Make is free software; you can redistribute it and/or modify
@@ -145,14 +145,15 @@ build_vpath_lists ()
   variable.

   If SEARCHPATH is nil, remove all previous listings with the same
-   pattern.  If PATTERN is nil, remove all VPATH listings.
-   Existing and readable directories that are not "." given in the
-   searchpath separated by colons are loaded into the directory hash
-   table if they are not there already and put in the VPATH searchpath
-   for the given pattern with trailing slashes stripped off if present
-   (and if the directory is not the root, "/").
-   The length of the longest entry in the list is put in the structure as well.
-   The new entry will be at the head of the VPATHS chain.  */
+   pattern.  If PATTERN is nil, remove all VPATH listings.  Existing
+   and readable directories that are not "." given in the searchpath
+   separated by the path element separator (defined in make.h) are
+   loaded into the directory hash table if they are not there already
+   and put in the VPATH searchpath for the given pattern with trailing
+   slashes stripped off if present (and if the directory is not the
+   root, "/").  The length of the longest entry in the list is put in
+   the structure as well.  The new entry will be at the head of the
+   VPATHS chain.  */

 void
 construct_vpath_list (pattern, dirpath)
@@ -213,10 +214,10 @@ construct_vpath_list (pattern, dirpath)
    convert_vpath_to_windows32(dirpath, ';');
 #endif

-  /* Figure out the maximum number of VPATH entries and
-     put it in MAXELEM.  We start with 2, one before the
-     first colon and one nil, the list terminator and
-     increment our estimated number for each colon or blank we find.  */
+  /* Figure out the maximum number of VPATH entries and put it in
+     MAXELEM.  We start with 2, one before the first separator and one
+     nil (the list terminator) and increment our estimated number for
+     each separator or blank we find.  */
  maxelem = 2;
  p = dirpath;
  while (*p != '\0')
@@ -226,7 +227,7 @@ construct_vpath_list (pattern, dirpath)
  vpath = (char **) xmalloc (maxelem * sizeof (char *));
  maxvpath = 0;

-  /* Skip over any initial colons and blanks.  */
+  /* Skip over any initial separators and blanks.  */
  p = dirpath;
  while (*p == PATH_SEPARATOR_CHAR || isblank (*p))
    ++p;
@@ -271,7 +272,7 @@ construct_vpath_list (pattern, dirpath)
 	    free (v);
 	}

-      /* Skip over colons and blanks between entries.  */
+      /* Skip over separators and blanks between entries.  */
      while (*p == PATH_SEPARATOR_CHAR || isblank (*p))
 	++p;
    }
@@ -310,19 +311,20 @@ construct_vpath_list (pattern, dirpath)
    }
 }

-/* Search the GPATH list for a directory where the name pointed to by FILE
-   exists.  If it is found, we set *FILE to the newly malloc'd name of the
-   existing file, *MTIME_PTR (if MTIME_PTR is not NULL) to its modtime (or
-   zero if no stat call was done), and return 1.  Otherwise we return 0.  */
+/* Search the GPATH list for a pathname string that matches the one passed
+   in.  If it is found, return 1.  Otherwise we return 0.  */

 int
-gpath_search (file, mtime_ptr)
-     char **file;
-     time_t *mtime_ptr;
+gpath_search (file, len)
+     char *file;
+     int len;
 {
-  if (gpaths != 0
-      && selective_vpath_search (gpaths, file, mtime_ptr))
-    return 1;
+  register char **gp;
+
+  if (gpaths && (len <= gpaths->maxlen))
+    for (gp = gpaths->searchpath; *gp != NULL; ++gp)
+      if (!strncmp(*gp, file, len) && (*gp)[len] == '\0')
+        return 1;

  return 0;
 }
@@ -434,7 +436,9 @@ selective_vpath_search (path, file, mtime_ptr)
      /* Add the directory prefix already in *FILE.  */
      if (name_dplen > 0)
 	{
+#ifndef VMS
 	  *n++ = '/';
+#endif
 	  bcopy (*file, n, name_dplen);
 	  n += name_dplen;
 	}
@@ -445,12 +449,14 @@ selective_vpath_search (path, file, mtime_ptr)
 	n[-1] = '/';
 #endif
      /* Now add the name-within-directory at the end of NAME.  */
+#ifndef VMS
      if (n != name && n[-1] != '/')
 	{
 	  *n = '/';
 	  bcopy (filename, n + 1, flen + 1);
 	}
      else
+#endif
 	bcopy (filename, n, flen + 1);

      /* Check if the file is mentioned in a makefile.  If *FILE is not
@@ -463,7 +469,7 @@ selective_vpath_search (path, file, mtime_ptr)
 	 inadequately commented change in July 1990; I am not sure off
 	 hand what problem it fixes.

-	 In December 1993 I loosened of this restriction to allow a file
+	 In December 1993 I loosened this restriction to allow a file
 	 to be chosen if it is mentioned as a target in a makefile.  This
 	 seem logical.  */
      {
@@ -477,6 +483,9 @@ selective_vpath_search (path, file, mtime_ptr)
 	  /* That file wasn't mentioned in the makefile.
 	     See if it actually exists.  */

+#ifdef VMS
+	  exists_in_cache = exists = dir_file_exists_p (vpath[i], filename);
+#else
 	  /* Clobber a null into the name at the last slash.
 	     Now NAME is the name of the directory to look in.  */
 	  *n = '\0';
@@ -485,6 +494,7 @@ selective_vpath_search (path, file, mtime_ptr)
 	     construct_vpath_list or the code just above put it there.
 	     Does the file we seek exist in it?  */
 	  exists_in_cache = exists = dir_file_exists_p (name, filename);
+#endif
 	}

      if (exists)
@@ -497,8 +507,10 @@ selective_vpath_search (path, file, mtime_ptr)

 	  struct stat st;

+#ifndef VMS
 	  /* Put the slash back in NAME.  */
 	  *n = '/';
+#endif

 	  if (!exists_in_cache	/* Makefile-mentioned file need not exist.  */
 	      || stat (name, &st) == 0) /* Does it really exist?  */
--- a/w32/compat/dirent.c
+++ b/w32/compat/dirent.c
@@ -90,7 +90,7 @@ closedir(DIR *pDir)
 struct dirent *
 readdir(DIR* pDir)
 {
-	WINDOWS32_FIND_DATA wfdFindData;
+	WIN32_FIND_DATA wfdFindData;

 	if (!pDir) {
 		errno = EINVAL;
--- a/w32/include/sub_proc.h
+++ b/w32/include/sub_proc.h
@@ -9,13 +9,6 @@
 * $Source$
 *
 * $Revision$
- *
- * Description: 
- *
- * (C) COPYRIGHT TIVOLI Systems, Inc. 1991-1994
- * Unpublished Work
- * All Rights Reserved
- * Licensed Material - Property of TIVOLI Systems, Inc.
 */

 /* $Id$ */
--- a/w32/subproc/NMakefile
+++ b/w32/subproc/NMakefile
@@ -1,7 +1,7 @@
 # NOTE: If you have no `make' program at all to process this makefile, run
 # `build.bat' instead.
 #
-# Copyright (C) 1988, 89, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc
+# Copyright (C) 1988,89,91,92,93,94,95,96,97 Free Software Foundation, Inc
 # This file is part of GNU Make.
 #
 # GNU Make is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@ CC = cl
 OUTDIR=.
 MAKEFILE=NMakefile

-CFLAGS_any = /nologo /MT /W3 /GX /Z7 /YX /D WINDOWS32 /D _WINDOWS  -I. -I../include
+CFLAGS_any = /nologo /MT /W3 /GX /Z7 /YX /D WIN32 /D WINDOWS32 /D _WINDOWS  -I. -I../include
 CFLAGS_debug = $(CFLAGS_any) /Od /D _DEBUG /FR.\WinDebug\ /Fp.\WinDebug\subproc.pch /Fo.\WinDebug/
 CFLAGS_release = $(CFLAGS_any) /O2 /FR.\WinRel\ /Fp.\WinRel\subproc.pch /Fo.\WinRel/

--- a/w32/subproc/build.bat
+++ b/w32/subproc/build.bat
@@ -1,10 +1,10 @@
 if not exist .\WinDebug\nul mkdir .\WinDebug
-cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WINDOWS32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c misc.c
-cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WINDOWS32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c sub_proc.c
-cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WINDOWS32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c w32err.c
+cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WIN32 /D WINDOWS32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c misc.c
+cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WIN32 /D WINDOWS32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c sub_proc.c
+cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WIN32 /D WINDOWS32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c w32err.c
 lib.exe /NOLOGO /OUT:.\WinDebug\subproc.lib  .\WinDebug/misc.obj  .\WinDebug/sub_proc.obj  .\WinDebug/w32err.obj
 if not exist .\WinRel\nul mkdir .\WinRel
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WINDOWS32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c misc.c
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WINDOWS32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c sub_proc.c
-cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WINDOWS32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c w32err.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WIN32 /D WINDOWS32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c misc.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WIN32 /D WINDOWS32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c sub_proc.c
+cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WIN32 /D WINDOWS32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c w32err.c
 lib.exe /NOLOGO /OUT:.\WinRel\subproc.lib  .\WinRel/misc.obj  .\WinRel/sub_proc.obj  .\WinRel/w32err.obj
--- a/w32/subproc/sub_proc.c
+++ b/w32/subproc/sub_proc.c
@@ -319,14 +319,10 @@ find_file(char *exec_path, LPOFSTRUCT file_info)
 	char *fname;
 	char *ext;

-	if ((exec_handle = (HANDLE)OpenFile(exec_path, file_info,
-			OF_READ | OF_SHARE_COMPAT)) != (HANDLE)HFILE_ERROR) {
-		return(exec_handle);
-	}
-
 	fname = malloc(strlen(exec_path) + 5);
 	strcpy(fname, exec_path);
 	ext = fname + strlen(fname);
+
 	strcpy(ext, ".exe");
 	if ((exec_handle = (HANDLE)OpenFile(fname, file_info,
 			OF_READ | OF_SHARE_COMPAT)) != (HANDLE)HFILE_ERROR) {
@@ -334,6 +330,13 @@ find_file(char *exec_path, LPOFSTRUCT file_info)
 		return(exec_handle);
 	}

+	strcpy(ext, ".cmd");
+	if ((exec_handle = (HANDLE)OpenFile(fname, file_info,
+			OF_READ | OF_SHARE_COMPAT)) != (HANDLE)HFILE_ERROR) {
+		free(fname);
+		return(exec_handle);
+	}
+
 	strcpy(ext, ".bat");
 	if ((exec_handle = (HANDLE)OpenFile(fname, file_info,
 			OF_READ | OF_SHARE_COMPAT)) != (HANDLE)HFILE_ERROR) {
@@ -341,6 +344,13 @@ find_file(char *exec_path, LPOFSTRUCT file_info)
 		return(exec_handle);
 	}

+	/* should .com come before this case? */
+	if ((exec_handle = (HANDLE)OpenFile(exec_path, file_info,
+			OF_READ | OF_SHARE_COMPAT)) != (HANDLE)HFILE_ERROR) {
+		free(fname);
+		return(exec_handle);
+	}
+
 	strcpy(ext, ".com");
 	if ((exec_handle = (HANDLE)OpenFile(fname, file_info,
 			OF_READ | OF_SHARE_COMPAT)) != (HANDLE)HFILE_ERROR) {
@@ -489,14 +499,8 @@ process_begin(
 	startInfo.hStdOutput = (HANDLE)pproc->sv_stdout[1];
 	startInfo.hStdError = (HANDLE)pproc->sv_stderr[1];

-	/*
-	 * See if we need to setuid to a different user.
-	 */
-	if (as_user) {
-		return -1;
-	}
-
 	if (as_user) {
+		if (envblk) free(envblk);
 		return -1;
 	} else {
 		if (CreateProcess(
@@ -514,6 +518,7 @@ process_begin(
 			pproc->last_err = GetLastError();
 			pproc->lerrno = E_FORK;
 			fprintf(stderr, "process_begin: CreateProcess(%s, %s, ...) failed.\n", exec_path, command_line);
+			if (envblk) free(envblk);
 			free( command_line );
 			return(-1);
 		}
@@ -538,6 +543,7 @@ process_begin(
 	}

 	free( command_line );
+	if (envblk) free(envblk);
 	pproc->lerrno=0;
 	return 0;
 }
@@ -1003,14 +1009,35 @@ make_command_line( char *shell_name, char *exec_path, char **argv)
 	char** nargv;
 	char*  buf;
 	int    i;
+	char** shargv = NULL;
+	char*  p = NULL;
+	char*  q = NULL;
+	int    j = 0;
 
 	if (shell_name) {
+		/* handle things like: #!/bin/sh -x */
+
+		/* count tokens */
+		q = strdup(shell_name);
+		for (j = 0, p = q; (p = strtok(p, " \t")) != NULL; p = NULL, j++);
+		free(q);
+
+		/* copy tokens */
+		q = strdup(shell_name);
+		shargv = (char **) malloc((j+1) * sizeof (char *));
+		for (j = 0, p = q; (p = strtok(p, " \t")) != NULL; p = NULL, j++)
+			shargv[j] = strdup(p);
+		shargv[j] = NULL;
+		free(q);
+
+		/* create argv */
 		for (i = 0; argv[i]; i++);
-		i += 2;
+		i += (j+1);
 		nargv = (char **) malloc(i * sizeof (char *));
-		nargv[0] = shell_name;
-		for (i = 1; argv[i-1]; i++)
-			nargv[i] = argv[i-1];
+		for (i = 0; shargv[i] != NULL; i++)
+			nargv[i] = shargv[i];
+		for (j = 0; argv[j]; j++, i++)
+			nargv[i] = argv[j];
 		nargv[i] = NULL;
 	} else
 		nargv = argv;
@@ -1018,8 +1045,12 @@ make_command_line( char *shell_name, char *exec_path, char **argv)
 	/* create string suitable for CreateProcess() */
 	buf = fix_command_line(nargv);

-	if (shell_name)
+	if (shell_name) {
+		for (j = 0; shargv[j]; j++)
+			free(shargv[j]);
+		free(shargv);
 		free(nargv);
+	}
 	
 	return buf;
 }
Author	SHA1	Message	Date
Paul Smith	f6490d62cf	GNU make 3.75.92	1997-08-27 21:14:44 +00:00
Paul Smith	480ad62713	New glob.h to understand __const	1997-08-27 20:43:43 +00:00
Paul Smith	acd666ce50	Updated for GNU make 3.75.92.	1997-08-27 20:36:31 +00:00
Paul Smith	be3fb0ae6d	Updates for GNU make 3.75.92.	1997-08-27 20:30:54 +00:00
Paul Smith	dd0c939e78	Last minute 3.75.91 changes.	1997-08-18 20:14:30 +00:00
Paul Smith	fff468765c	e the global copy of this lib.	1997-08-18 19:31:49 +00:00
Paul Smith	63dff1e0bc	Bug fixes and automake changes.	1997-08-18 18:11:04 +00:00
Paul Smith	e746a9c951	Removed files that are no longer needed now that we use automake.	1997-08-18 16:48:45 +00:00
Paul Smith	74d4418f1c	Removed files that are no longer needed now that we use automake.	1997-08-18 15:19:04 +00:00
Miles Bader	062e5f6aae	automatically generated from GPLed version	1997-08-14 02:25:35 +00:00
Paul Eggert	c495345f7c	automatically generated from GPLed version	1997-08-14 02:16:15 +00:00