* Update FSF address info in copyright notices.

* Update maintainers build process; remove GNUmakefile.  Require builders to
  run automake && autoreconf by hand.
* Use AC_SUBST_FILE to get the maintMakefile included, rather than GNU
  make's include directive, which conflicts with automake 1.4's include
  directive.

38 files changed, 93 insertions, 104 deletions

diff --git a/.cvsignore b/.cvsignore
index c49c6da..446fbca 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -13,9 +13,9 @@ makebook*
 
 README aclocal.m4 config.h.in config.h configure Makefile.in
 build.sh.in build.sh SMakefile config.ami README.DOS Makefile.DOS configh.dos
-NMakefile config.h.W32 config.h-vms glob/Makefile.in
+NMakefile config.h.W32 config.h-vms
 
-.deps .dep_segment glob/.deps
+.deps .dep_segment
 
 _*
 sun4 i386 i386-netbsd hp300-netbsd hp300 rs6000 sun3 news800 amiga
diff --git a/ChangeLog b/ChangeLog
index 767504f..021562b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
+1999-03-05  Paul D. Smith  <psmith@gnu.org>
+
+	* Makefile.am, configure.in: Use AC_SUBST_FILE to insert the
+	maintMakefile instead of "include", to avoid automake 1.4
+	incompatibility.
+
 1999-03-04  Paul D. Smith  <psmith@gnu.org>
 
+	* amiga.c, amiga.h, ar.c, arscan.c, commands.c, commands.h,
+	* default.c, dep.h, dir.c, expand.c, file.c, filedef.h, functions.c,
+	* implicit.c, job.c, job.h, main.c, make.h, misc.c, read.c, remake.c
+	* remote-cstms.c, remote-stub.c, rule.h, variable.c, variable.h,
+	* vpath.c, Makefile.ami, NMakefile.template, build.template,
+	* makefile.vms: Updated FSF address in the copyright notice.
+
 	* variable.c (try_variable_definition): If we see a conditional
 	variable and we decide to set it, re-type it as recursive so it
 	will be expanded properly later.
diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644
index 97b2e1d..0000000
--- a/GNUmakefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# This is a maintainer's-only makefile
-#
-# It bootstraps a GNU make maintainer's directory
-#
-
-.SUFFIXES:
-
-NORECURSE = true
-
-ACLOCALARGS =
-
-CFLAGS = -g -O -Wall -D__USE_FIXED_PROTOTYPES__
-export CFLAGS
-
-# If the user asked for a specific target, invoke the Makefile instead.
-#
-.DEFAULT:
-	@[ -f Makefile.in -a -f configure -a -f aclocal.m4 -a -f config.h.in ] \
-	  || $(MAKE) __cfg NORECURSE=
-	@[ -f Makefile ] \
-	  || CFLAGS='-g -O -Wall -D__USE_FIXED_PROTOTYPES__' ./configure
-	$(MAKE) -f Makefile $@
-
-.PHONY: __cfg __cfg_basic
-
-# This is variable since the glob subdirectory doesn't use it.
-#
-ACCONFIG = acconfig.h
-
-__cfg: __cfg_basic config.h.in TAGS
-ifdef NORECURSE
-	@echo ""; echo "Now you should run:"; echo ""; \
-	  echo "  make all"; echo ""; \
-	  echo "then, optionally, one of:"; echo ""; \
-	  echo "  make dist"; \
-	  echo "  make distdir"; \
-	  echo "  make distcheck"; \
-	  echo ""
-endif
-
-__cfg_basic: aclocal.m4 stamp-h.in configure Makefile.in
-
-aclocal.m4: configure.in $(wildcard acinclude.m4)
-	aclocal $(ACLOCALARGS)
-
-config.h.in: stamp-h.in
-stamp-h.in: configure.in aclocal.m4 $(ACCONFIG)
-	autoheader
-	echo timestamp > $@
-
-configure: configure.in aclocal.m4
-	autoconf $(ACARGS)
-
-Makefile.in: configure.in config.h.in Makefile.am aclocal.m4
-	automake --add-missing
-
-TAGS:
-	find . -name '*.[ch]' -print | etags -
diff --git a/Makefile.am b/Makefile.am
index 3bfaf47..e1e9990 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,10 +127,4 @@ check-regression: all
 
 # --------------- 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.
-# Ulp!  Need a leading space to "hide" this include from automake's new (in
-# 1.4) include feature :(
- include $(srcdir)/maintMakefile
-endif
+@MAINT_MAKEFILE@
diff --git a/Makefile.ami b/Makefile.ami
index 94845ec..8a71d69 100644
--- a/Makefile.ami
+++ b/Makefile.ami
@@ -16,7 +16,8 @@
 #
 # 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.
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 #
 #	Makefile for GNU Make
diff --git a/NMakefile.template b/NMakefile.template
index 8f2b3f3..d9f2458 100644
--- a/NMakefile.template
+++ b/NMakefile.template
@@ -16,7 +16,8 @@
 #
 # 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.
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 #
 #       NMakefile for GNU Make
diff --git a/SMakefile.template b/SMakefile.template
index 2caa82e..5850abe 100644
--- a/SMakefile.template
+++ b/SMakefile.template
@@ -16,16 +16,17 @@
 #
 # 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.
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 #
 #	Makefile for GNU Make
 #
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
-VPATH = /make-3.74/
+VPATH = /make-%VERSION%/
 # This must repeat the value, because configure will remove `VPATH = .'.
-srcdir = /make-3.74/
+srcdir = /make-%VERSION%/
 
 CC = sc
 RM = delete
diff --git a/amiga.c b/amiga.c
index d0e4ff5..db8ef0d 100644
--- a/amiga.c
+++ b/amiga.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "variable.h"
diff --git a/amiga.h b/amiga.h
index e77d999..99a1c59 100644
--- a/amiga.h
+++ b/amiga.h
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA 02111-1307, USA.  */
 
 extern int MyExecute PARAMS ((char ** argv));
 extern char * wildcard_expansion PARAMS ((char * wc, char * o));
diff --git a/ar.c b/ar.c
index 04d7411..9ca1e15 100644
--- a/ar.c
+++ b/ar.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 
diff --git a/arscan.c b/arscan.c
index 09d01ad..5c4a48f 100644
--- a/arscan.c
+++ b/arscan.c
@@ -13,7 +13,8 @@ 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.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.  */
 
 #include "make.h"
 
diff --git a/build.template b/build.template
index a4aa867..aee512f 100644
--- a/build.template
+++ b/build.template
@@ -17,7 +17,8 @@
 #
 # 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.
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 # See Makefile.in for comments describing these variables.
 
diff --git a/commands.c b/commands.c
index 166b96d..58107ef 100644
--- a/commands.c
+++ b/commands.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "dep.h"
diff --git a/commands.h b/commands.h
index 9547fc3..edec910 100644
--- a/commands.h
+++ b/commands.h
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Structure that gives the commands to make a file
    and information about where these commands came from.  */
diff --git a/configure.in b/configure.in
index bc72d7d..87d8062 100644
--- a/configure.in
+++ b/configure.in
@@ -6,8 +6,6 @@ AC_INIT(vpath.c)dnl		dnl A distinctive file to look for in srcdir.
 AM_INIT_AUTOMAKE(make, 3.77.90)
 AM_CONFIG_HEADER(config.h)
 
-AM_CONDITIONAL(MAINT_MAKEFILE, test -r $srcdir/maintMakefile)
-
 dnl Regular configure stuff
 
 AC_PROG_MAKE_SET
@@ -174,6 +172,15 @@ case "$make_cv_sys_gnu_glob" in
        CPPFLAGS="$CPPFLAGS -I$srcdir/glob" ;;
 esac
 
+
+MAINT_MAKEFILE=/dev/null
+if test -r $srcdir/maintMakefile; then
+  MAINT_MAKEFILE="$srcdir/maintMakefile"
+fi
+AC_SUBST_FILE(MAINT_MAKEFILE)
+
+dnl AM_CONDITIONAL(MAINT_MAKEFILE, test -r $srcdir/maintMakefile)
+
 AC_OUTPUT(Makefile glob/Makefile build.sh)
 
 case "$make_badcust" in
diff --git a/default.c b/default.c
index 76a3232..902909f 100644
--- a/default.c
+++ b/default.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "rule.h"
diff --git a/dep.h b/dep.h
index 2f9561c..ca8112f 100644
--- a/dep.h
+++ b/dep.h
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Flag bits for the second argument to `read_makefile'.
    These flags are saved in the `changed' field of each
diff --git a/dir.c b/dir.c
index 9e1cf7a..9f79a4d 100644
--- a/dir.c
+++ b/dir.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 
diff --git a/expand.c b/expand.c
index 31c4024..db29174 100644
--- a/expand.c
+++ b/expand.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "filedef.h"
diff --git a/file.c b/file.c
index 22e9584..1321b55 100644
--- a/file.c
+++ b/file.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <assert.h>
 
diff --git a/filedef.h b/filedef.h
index 6ee5214..f4d894f 100644
--- a/filedef.h
+++ b/filedef.h
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Structure that represents the info on one file
diff --git a/function.c b/function.c
index a04a467..def3863 100644
--- a/function.c
+++ b/function.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "filedef.h"
diff --git a/glob/.cvsignore b/glob/.cvsignore
new file mode 100644
index 0000000..e8e7be4
--- /dev/null
+++ b/glob/.cvsignore
@@ -0,0 +1 @@
+.deps Makefile.in
diff --git a/implicit.c b/implicit.c
index 4be5cf5..dfe19da 100644
--- a/implicit.c
+++ b/implicit.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "rule.h"
diff --git a/job.c b/job.c
index 7a77481..5ea6067 100644
--- a/job.c
+++ b/job.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "job.h"
diff --git a/job.h b/job.h
index d60247a..4f2a3ae 100644
--- a/job.h
+++ b/job.h
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef SEEN_JOB_H
 #define SEEN_JOB_H
diff --git a/main.c b/main.c
index efad30d..7c141e8 100644
--- a/main.c
+++ b/main.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "dep.h"
@@ -2363,7 +2364,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, 97, 98\n\
+%sCopyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99\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\
diff --git a/make.h b/make.h
index 9f5af96..ee7721d 100644
--- a/make.h
+++ b/make.h
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* AIX requires this to be the first thing in the file.  */
 #if defined (_AIX) && !defined (__GNUC__)
diff --git a/makefile.vms b/makefile.vms
index a1ad841..9b8208a 100644
--- a/makefile.vms
+++ b/makefile.vms
@@ -16,7 +16,8 @@
 #
 # 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.
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 CC = cc/warn
 CP = copy
diff --git a/misc.c b/misc.c
index 0612862..87694e2 100644
--- a/misc.c
+++ b/misc.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "dep.h"
diff --git a/read.c b/read.c
index 3303ba9..1ce892d 100644
--- a/read.c
+++ b/read.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <assert.h>
 
diff --git a/remake.c b/remake.c
index fdd868a..4604ea5 100644
--- a/remake.c
+++ b/remake.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "filedef.h"
diff --git a/remote-cstms.c b/remote-cstms.c
index cf91816..18d4ed6 100644
--- a/remote-cstms.c
+++ b/remote-cstms.c
@@ -18,7 +18,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "job.h"
diff --git a/remote-stub.c b/remote-stub.c
index 1ff9b04..69af397 100644
--- a/remote-stub.c
+++ b/remote-stub.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "filedef.h"
diff --git a/rule.h b/rule.h
index f57c7e0..30cc544 100644
--- a/rule.h
+++ b/rule.h
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Structure used for pattern rules.  */
 
diff --git a/variable.c b/variable.c
index c0a2199..4537023 100644
--- a/variable.c
+++ b/variable.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "dep.h"
diff --git a/variable.h b/variable.h
index b1d0daf..4826c76 100644
--- a/variable.h
+++ b/variable.h
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Codes in a variable definition saying where the definition came from.
    Increasing numeric values signify less-overridable definitions.  */
diff --git a/vpath.c b/vpath.c
index d332031..41cc317 100644
--- a/vpath.c
+++ b/vpath.c
@@ -14,7 +14,8 @@ 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "make.h"
 #include "filedef.h"