* 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.

diff --git a/.cvsignore b/.cvsignore
index c49c6da71272ea98add72532194665d68dad45b4..446fbca39aa8d2926196f01ffe8db164120166bc 100644 (file)
--- 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 767504fc6e547528ea8229a12734f403f54994e4..021562bee346cf1e88c9e9ef4be76ca7e4eec7c7 100644 (file)
--- 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 (file)
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 3bfaf47c93f4f02e68fa51c532a64b2ff7507e26..e1e99906b7ca21287d23e100cd105e89d8661ecd 100644 (file)
--- 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 94845ec0ea359601954f4fabd769d8f9c5ae9dcb..8a71d690d6444d2be76ec41f7694787c8477fb06 100644 (file)
--- 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 8f2b3f3736b62dd3456465fb8dd50867b2873bd8..d9f24589be44f03a589d56fa02c18e1a5e6cd90b 100644 (file)
--- 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 2caa82ea873e0d2232016a0ada4d3440ff1f896e..5850abedbb242fb9ac55c2e4ecaf020aa3b6407c 100644 (file)
--- 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 d0e4ff509d9c7e7579080e9024fa7cfc9f52b61b..db8ef0df83328ed004403eb853f92b1b1e911688 100644 (file)
--- 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 e77d999cc2a0813b33c95a5bd2d6a11c2fcfd81f..99a1c598d67bfb06efe8eb9910edd43792f07e7b 100644 (file)
--- 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 04d7411806df82fd3143f52ab3da9d71eafb3766..9ca1e15b737be8ef68a22559581b72408667538f 100644 (file)
--- 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 09d01ad5e5bcff6b329fa0256c9ff267f8212160..5c4a48f486b1362fca51124a219d458b8df944bb 100644 (file)
--- 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 a4aa867c620530dbdbc223945a4add3e94d59638..aee512f7bcd9f11bb633760234fbee5489b16f94 100644 (file)
--- 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 166b96d896115e8ab22281e577f4e05bf0078153..58107efec388f2962f3fcd2910b562ec625dd31d 100644 (file)
--- 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 9547fc360e290572a4bb4ae4f71bc97205deb7ed..edec91032c13a40a29eff2a0528b5cad4ea7876a 100644 (file)
--- 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 bc72d7d38ab0e3bb5b94584d893eb91bc64f0dd7..87d80624a448d4d254b1d735e835af66982a0716 100644 (file)
--- 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 76a32324adb162bde68f257d045b57e937b12dae..902909fa3dd457c82e5ab73811a6c53b193256b4 100644 (file)
--- 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 2f9561c9b7864fb0d460a44c2c37b326d8e138e1..ca8112fea9cf0e39af9394ecd7a054d4575bd65b 100644 (file)
--- 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 9e1cf7af5f8b8d833885eb40fa94db5a0c3aa590..9f79a4d36f7b072be4bf60f0275042fe1a09ddcb 100644 (file)
--- 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 31c402490ca1ba4d2e0a4d9ec8bfa8e91b510f4a..db29174ba2e9223f3e55faaada60d34c249f14a1 100644 (file)
--- 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 22e95840e9c243f9e995663f1089d07708983aab..1321b551af0b038e1be12cf27d83098661abe8a0 100644 (file)
--- 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 6ee5214399d0caff5bb11358781e7456935e0362..f4d894fe26ddfd5178f8135d2002439307b1d2dc 100644 (file)
--- 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 a04a4679c74fcd536979b9bd172f42f2c0cc423b..def386336e44da07b704689e07eccfa3f324eae6 100644 (file)
--- 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 (file)
index 0000000..e8e7be4
--- /dev/null
+++ b/glob/.cvsignore
@@ -0,0 +1 @@
+.deps Makefile.in

diff --git a/implicit.c b/implicit.c
index 4be5cf55c4d5926f7641a7a16c21dec774946cfa..dfe19da4c4db365f428480373f47b171bd9a5b3f 100644 (file)
--- 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 7a77481e205ca13d928b854c090f15661baa4879..5ea60671e887dfad978c0977a18a51f4690c2bfe 100644 (file)
--- 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 d60247ad9e11a5bef47094171b1ebac622610710..4f2a3ae64136144d8d9f9f59e10c550feb9c8804 100644 (file)
--- 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 efad30db6e755017b63a55e9076e0515a4ebc44b..7c141e8c11c2f4ecde4a7db40d2e0e5fc194a7a4 100644 (file)
--- 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 9f5af966c635483d17884e0cf242754ee8a996ce..ee7721d8b621748e9ce0cd74cbbb42fbf09011f2 100644 (file)
--- 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 a1ad8415cee7d2df3e276c1fbc95cf6dd3b722d9..9b8208a2931aa3194d494cea3da8b1adfed2ede9 100644 (file)
--- 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 0612862bf43e43d514c1abac705324cb0ab027b1..87694e2991b5ba54f0e8f6ec2df75056069f6986 100644 (file)
--- 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 3303ba9da1225ca991fd228f1b93037083b43fbb..1ce892d0f65c2df96883a21b98ec572345d520ab 100644 (file)
--- 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 fdd868ace6a4c703dfa4c7ace4a4fcd76f3b69b0..4604ea5f4f27d6dc1bc3e2869316c9b0f80ec914 100644 (file)
--- 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 cf918163dec8b2945cbb98ce8a50ba60364f2287..18d4ed6e24b04d722a0e5cde509a09945f86ec76 100644 (file)
--- 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 1ff9b04a73b5dc5266536ad20e3125b171064745..69af39752a59ae106ed5804fd4d3cf44c490931d 100644 (file)
--- 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 f57c7e01e06df0892949a7a150d8772d6efc4675..30cc54492498df18632f912dcedca170889d4526 100644 (file)
--- 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 c0a2199fb29388b446809d3d533629f5e3c56922..4537023ae12aa9c035b3126b4f456070f26ee323 100644 (file)
--- 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 b1d0daf4e7a441ad45ff17a82315f7bbabad89fc..4826c76d34da856552cb4f00eb387b9a8e9870e7 100644 (file)
--- 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 d3320313ee07993b2625b8fd0afed77144e65668..41cc317cb525c464e674d0b0060bc1cee51b6d7d 100644 (file)
--- 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"