summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING6
-rw-r--r--ChangeLog234
-rw-r--r--ChangeLog.004
-rw-r--r--ChangeLog.014
-rw-r--r--ChangeLog.024
-rw-r--r--ChangeLog.034
-rw-r--r--ChangeLog.964
-rw-r--r--ChangeLog.984
-rw-r--r--HACKING4
-rw-r--r--Makefile.am4
-rw-r--r--NEWS4
-rw-r--r--README4
-rw-r--r--TODO4
-rw-r--r--aclocal.in4
-rwxr-xr-xautomake.in4
-rwxr-xr-xbootstrap2
-rwxr-xr-xconfigure510
-rw-r--r--configure.ac4
-rw-r--r--doc/Makefile.am4
-rw-r--r--doc/fdl.texi10
-rw-r--r--lib/Automake/ChannelDefs.pm4
-rw-r--r--lib/Automake/Channels.pm4
-rw-r--r--lib/Automake/Condition.pm4
-rw-r--r--lib/Automake/Config.in4
-rw-r--r--lib/Automake/Configure_ac.pm4
-rw-r--r--lib/Automake/DisjConditions.pm4
-rw-r--r--lib/Automake/FileUtils.pm4
-rw-r--r--lib/Automake/General.pm4
-rw-r--r--lib/Automake/Item.pm4
-rw-r--r--lib/Automake/ItemDef.pm4
-rw-r--r--lib/Automake/Location.pm4
-rw-r--r--lib/Automake/Makefile.am4
-rw-r--r--lib/Automake/Options.pm4
-rw-r--r--lib/Automake/Rule.pm4
-rw-r--r--lib/Automake/RuleDef.pm4
-rw-r--r--lib/Automake/Struct.pm4
-rw-r--r--lib/Automake/VarDef.pm4
-rw-r--r--lib/Automake/Variable.pm4
-rw-r--r--lib/Automake/Version.pm4
-rw-r--r--lib/Automake/Wrap.pm4
-rw-r--r--lib/Automake/XFile.pm4
-rw-r--r--lib/Automake/tests/Condition.pl4
-rw-r--r--lib/Automake/tests/DisjConditions.pl4
-rw-r--r--lib/Automake/tests/Makefile.am4
-rw-r--r--lib/Automake/tests/Version.pl4
-rw-r--r--lib/Automake/tests/Wrap.pl4
-rw-r--r--lib/COPYING4
-rw-r--r--lib/Makefile.am4
-rwxr-xr-xlib/acinstall4
-rw-r--r--lib/am/Makefile.am4
-rw-r--r--lib/am/ansi2knr.am4
-rw-r--r--lib/am/check.am4
-rw-r--r--lib/am/clean-hdr.am4
-rw-r--r--lib/am/clean.am4
-rw-r--r--lib/am/compile.am4
-rw-r--r--lib/am/configure.am4
-rw-r--r--lib/am/data.am4
-rw-r--r--lib/am/dejagnu.am4
-rw-r--r--lib/am/depend.am4
-rw-r--r--lib/am/depend2.am4
-rw-r--r--lib/am/distdir.am4
-rw-r--r--lib/am/footer.am4
-rw-r--r--lib/am/header-vars.am4
-rw-r--r--lib/am/header.am4
-rw-r--r--lib/am/inst-vars.am4
-rw-r--r--lib/am/install.am4
-rw-r--r--lib/am/java.am4
-rw-r--r--lib/am/lang-compile.am4
-rw-r--r--lib/am/lex.am4
-rw-r--r--lib/am/library.am4
-rw-r--r--lib/am/libs.am4
-rw-r--r--lib/am/libtool.am4
-rw-r--r--lib/am/lisp.am4
-rw-r--r--lib/am/ltlib.am4
-rw-r--r--lib/am/ltlibrary.am4
-rw-r--r--lib/am/mans-vars.am4
-rw-r--r--lib/am/mans.am4
-rw-r--r--lib/am/multilib.am4
-rw-r--r--lib/am/program.am4
-rw-r--r--lib/am/progs.am4
-rw-r--r--lib/am/python.am4
-rw-r--r--lib/am/remake-hdr.am4
-rw-r--r--lib/am/scripts.am4
-rw-r--r--lib/am/subdirs.am4
-rw-r--r--lib/am/tags.am4
-rw-r--r--lib/am/texi-vers.am4
-rw-r--r--lib/am/texibuild.am4
-rw-r--r--lib/am/texinfos.am4
-rw-r--r--lib/am/yacc.am4
-rwxr-xr-xlib/compile4
-rw-r--r--lib/config-ml.in4
-rwxr-xr-xlib/config.guess2
-rw-r--r--lib/config.sub4
-rwxr-xr-xlib/depcomp6
-rwxr-xr-xlib/elisp-comp4
-rwxr-xr-xlib/gnupload6
-rwxr-xr-xlib/install-sh2
-rwxr-xr-xlib/mdate-sh4
-rwxr-xr-xlib/missing6
-rwxr-xr-xlib/mkinstalldirs2
-rwxr-xr-xlib/py-compile6
-rwxr-xr-xlib/symlink-tree4
-rw-r--r--lib/texinfo.tex4
-rwxr-xr-xlib/ylwrap5
-rw-r--r--m4/Makefile.am4
-rwxr-xr-xtests/aclibobj.test4
-rwxr-xr-xtests/acloca10.test4
-rwxr-xr-xtests/acloca11.test4
-rwxr-xr-xtests/acloca12.test4
-rwxr-xr-xtests/acloca13.test4
-rwxr-xr-xtests/acloca14.test4
-rwxr-xr-xtests/acloca15.test4
-rwxr-xr-xtests/acloca16.test4
-rwxr-xr-xtests/acloca17.test4
-rwxr-xr-xtests/acloca18.test4
-rwxr-xr-xtests/acloca19.test4
-rwxr-xr-xtests/aclocal.test4
-rwxr-xr-xtests/aclocal3.test4
-rwxr-xr-xtests/aclocal4.test4
-rwxr-xr-xtests/aclocal5.test4
-rwxr-xr-xtests/aclocal6.test4
-rwxr-xr-xtests/aclocal7.test4
-rwxr-xr-xtests/aclocal8.test4
-rwxr-xr-xtests/aclocal9.test4
-rwxr-xr-xtests/acoutbs.test4
-rwxr-xr-xtests/acoutbs2.test4
-rwxr-xr-xtests/acoutnoq.test4
-rwxr-xr-xtests/acoutpt.test4
-rwxr-xr-xtests/acoutpt2.test4
-rwxr-xr-xtests/acoutqnl.test4
-rwxr-xr-xtests/acsilent.test4
-rwxr-xr-xtests/acsubst.test4
-rwxr-xr-xtests/acsubst2.test4
-rwxr-xr-xtests/all.test4
-rwxr-xr-xtests/alloca.test4
-rwxr-xr-xtests/alloca2.test4
-rwxr-xr-xtests/alpha.test4
-rwxr-xr-xtests/alpha2.test4
-rwxr-xr-xtests/amassign.test4
-rwxr-xr-xtests/ammissing.test4
-rwxr-xr-xtests/ansi.test4
-rwxr-xr-xtests/ansi10.test4
-rwxr-xr-xtests/ansi2.test4
-rwxr-xr-xtests/ansi3.test4
-rwxr-xr-xtests/ansi3b.test4
-rwxr-xr-xtests/ansi4.test4
-rwxr-xr-xtests/ansi5.test4
-rwxr-xr-xtests/ansi6.test4
-rwxr-xr-xtests/ansi7.test4
-rwxr-xr-xtests/ansi8.test4
-rwxr-xr-xtests/ansi9.test4
-rwxr-xr-xtests/ar.test4
-rwxr-xr-xtests/ar2.test4
-rwxr-xr-xtests/asm.test4
-rwxr-xr-xtests/autohdr.test4
-rwxr-xr-xtests/autohdr2.test4
-rwxr-xr-xtests/autohdr3.test4
-rwxr-xr-xtests/autohdr4.test4
-rwxr-xr-xtests/automake.test4
-rwxr-xr-xtests/auxdir.test4
-rwxr-xr-xtests/auxdir2.test4
-rwxr-xr-xtests/auxdir3.test4
-rwxr-xr-xtests/auxdir4.test4
-rwxr-xr-xtests/backsl.test4
-rwxr-xr-xtests/backsl2.test4
-rwxr-xr-xtests/backsl3.test4
-rwxr-xr-xtests/backsl4.test4
-rwxr-xr-xtests/badline.test4
-rwxr-xr-xtests/badopt.test4
-rwxr-xr-xtests/badprog.test4
-rwxr-xr-xtests/block.test4
-rwxr-xr-xtests/bsource.test4
-rwxr-xr-xtests/canon.test4
-rwxr-xr-xtests/canon2.test4
-rwxr-xr-xtests/canon3.test4
-rwxr-xr-xtests/canon4.test4
-rwxr-xr-xtests/canon5.test4
-rwxr-xr-xtests/ccnoco.test4
-rwxr-xr-xtests/check.test4
-rwxr-xr-xtests/check2.test4
-rwxr-xr-xtests/check3.test4
-rwxr-xr-xtests/check4.test4
-rwxr-xr-xtests/checkall.test4
-rwxr-xr-xtests/clean.test4
-rwxr-xr-xtests/clean2.test4
-rwxr-xr-xtests/colneq.test4
-rwxr-xr-xtests/colneq2.test4
-rwxr-xr-xtests/colon.test4
-rwxr-xr-xtests/colon2.test4
-rwxr-xr-xtests/colon3.test4
-rwxr-xr-xtests/colon4.test4
-rwxr-xr-xtests/colon5.test4
-rwxr-xr-xtests/colon6.test4
-rwxr-xr-xtests/colon7.test4
-rwxr-xr-xtests/comment.test4
-rwxr-xr-xtests/comment2.test4
-rwxr-xr-xtests/comment3.test4
-rwxr-xr-xtests/comment4.test4
-rwxr-xr-xtests/comment5.test4
-rwxr-xr-xtests/comment6.test4
-rwxr-xr-xtests/comment7.test4
-rwxr-xr-xtests/comment8.test4
-rwxr-xr-xtests/comment9.test4
-rwxr-xr-xtests/compile.test4
-rwxr-xr-xtests/compile_f90_c_cxx.test4
-rwxr-xr-xtests/compile_f_c_cxx.test4
-rwxr-xr-xtests/cond.test4
-rwxr-xr-xtests/cond10.test4
-rwxr-xr-xtests/cond11.test4
-rwxr-xr-xtests/cond13.test4
-rwxr-xr-xtests/cond14.test4
-rwxr-xr-xtests/cond15.test4
-rwxr-xr-xtests/cond16.test4
-rwxr-xr-xtests/cond17.test4
-rwxr-xr-xtests/cond18.test4
-rwxr-xr-xtests/cond19.test4
-rwxr-xr-xtests/cond2.test4
-rwxr-xr-xtests/cond20.test4
-rwxr-xr-xtests/cond21.test4
-rwxr-xr-xtests/cond22.test4
-rwxr-xr-xtests/cond23.test4
-rwxr-xr-xtests/cond24.test4
-rwxr-xr-xtests/cond25.test4
-rwxr-xr-xtests/cond26.test4
-rwxr-xr-xtests/cond27.test4
-rwxr-xr-xtests/cond28.test4
-rwxr-xr-xtests/cond29.test4
-rwxr-xr-xtests/cond3.test4
-rwxr-xr-xtests/cond30.test4
-rwxr-xr-xtests/cond31.test4
-rwxr-xr-xtests/cond32.test4
-rwxr-xr-xtests/cond33.test4
-rwxr-xr-xtests/cond34.test4
-rwxr-xr-xtests/cond35.test4
-rwxr-xr-xtests/cond36.test4
-rwxr-xr-xtests/cond37.test4
-rwxr-xr-xtests/cond4.test4
-rwxr-xr-xtests/cond5.test4
-rwxr-xr-xtests/cond6.test4
-rwxr-xr-xtests/cond7.test4
-rwxr-xr-xtests/cond8.test4
-rwxr-xr-xtests/cond9.test4
-rwxr-xr-xtests/condd.test4
-rwxr-xr-xtests/condhook.test4
-rwxr-xr-xtests/condinc.test4
-rwxr-xr-xtests/condinc2.test4
-rwxr-xr-xtests/condlib.test4
-rwxr-xr-xtests/condman.test4
-rwxr-xr-xtests/condman2.test4
-rwxr-xr-xtests/conf2.test4
-rwxr-xr-xtests/confdeps.test4
-rwxr-xr-xtests/conff.test4
-rwxr-xr-xtests/conff2.test4
-rwxr-xr-xtests/confh.test4
-rwxr-xr-xtests/confh4.test4
-rwxr-xr-xtests/confh5.test4
-rwxr-xr-xtests/config.test4
-rwxr-xr-xtests/confincl.test4
-rwxr-xr-xtests/conflnk.test4
-rwxr-xr-xtests/conflnk2.test4
-rwxr-xr-xtests/conflnk3.test4
-rwxr-xr-xtests/confsub.test4
-rwxr-xr-xtests/confvar.test4
-rwxr-xr-xtests/confvar2.test4
-rwxr-xr-xtests/copy.test4
-rwxr-xr-xtests/ctarget1.test4
-rwxr-xr-xtests/cxx.test4
-rwxr-xr-xtests/cxx2.test4
-rwxr-xr-xtests/cxxansi.test4
-rwxr-xr-xtests/cxxcpp.test4
-rwxr-xr-xtests/cxxlibobj.test4
-rwxr-xr-xtests/cxxlink.test4
-rwxr-xr-xtests/cxxnoc.test4
-rwxr-xr-xtests/cxxo.test4
-rwxr-xr-xtests/cygwin32.test4
-rwxr-xr-xtests/dash.test4
-rw-r--r--tests/defs.in4
-rwxr-xr-xtests/defun.test4
-rwxr-xr-xtests/defun2.test4
-rwxr-xr-xtests/dejagnu.test4
-rwxr-xr-xtests/dejagnu2.test4
-rwxr-xr-xtests/dejagnu3.test4
-rwxr-xr-xtests/dejagnu4.test4
-rwxr-xr-xtests/dejagnu5.test4
-rwxr-xr-xtests/dejagnu6.test4
-rwxr-xr-xtests/dejagnu7.test4
-rwxr-xr-xtests/depacl2.test4
-rwxr-xr-xtests/depcomp.test4
-rwxr-xr-xtests/depcomp2.test4
-rwxr-xr-xtests/depcomp3.test4
-rwxr-xr-xtests/depcomp4.test4
-rwxr-xr-xtests/depcomp5.test4
-rwxr-xr-xtests/depdist.test4
-rwxr-xr-xtests/depend.test4
-rwxr-xr-xtests/depend2.test4
-rwxr-xr-xtests/depend3.test4
-rwxr-xr-xtests/depend4.test4
-rwxr-xr-xtests/destdir.test4
-rwxr-xr-xtests/dirforbid.test4
-rwxr-xr-xtests/dirlist.test4
-rwxr-xr-xtests/discover.test4
-rwxr-xr-xtests/distcom2.test4
-rwxr-xr-xtests/distcom3.test4
-rwxr-xr-xtests/distcom4.test4
-rwxr-xr-xtests/distcom5.test4
-rwxr-xr-xtests/distcom6.test4
-rwxr-xr-xtests/distcom7.test4
-rwxr-xr-xtests/distdir.test4
-rwxr-xr-xtests/distname.test4
-rwxr-xr-xtests/dollar.test4
-rwxr-xr-xtests/double.test4
-rwxr-xr-xtests/dup2.test4
-rwxr-xr-xtests/else.test4
-rwxr-xr-xtests/empty.test4
-rwxr-xr-xtests/empty2.test4
-rwxr-xr-xtests/empty3.test4
-rwxr-xr-xtests/empty4.test4
-rwxr-xr-xtests/exdir.test4
-rwxr-xr-xtests/exdir2.test4
-rwxr-xr-xtests/exeext.test4
-rwxr-xr-xtests/exeext2.test4
-rwxr-xr-xtests/exeext3.test4
-rwxr-xr-xtests/exeext4.test4
-rwxr-xr-xtests/exsource.test4
-rwxr-xr-xtests/ext.test4
-rwxr-xr-xtests/ext2.test4
-rwxr-xr-xtests/extra.test4
-rwxr-xr-xtests/extra2.test4
-rwxr-xr-xtests/extra3.test4
-rwxr-xr-xtests/extra4.test4
-rwxr-xr-xtests/extra5.test4
-rwxr-xr-xtests/extra6.test4
-rwxr-xr-xtests/extra7.test4
-rwxr-xr-xtests/f90only.test4
-rwxr-xr-xtests/flibs.test4
-rwxr-xr-xtests/fn99.test4
-rwxr-xr-xtests/fnoc.test4
-rwxr-xr-xtests/fo.test4
-rwxr-xr-xtests/fonly.test4
-rwxr-xr-xtests/fortdep.test4
-rwxr-xr-xtests/fpinst2.test4
-rwxr-xr-xtests/fpinstall.test4
-rwxr-xr-xtests/gcj.test4
-rwxr-xr-xtests/gcj2.test4
-rwxr-xr-xtests/gcj3.test4
-rwxr-xr-xtests/gcj4.test4
-rwxr-xr-xtests/gcj5.test4
-rwxr-xr-xtests/getopt.test4
-rwxr-xr-xtests/gettext.test4
-rwxr-xr-xtests/gettext2.test4
-rwxr-xr-xtests/gnits.test4
-rwxr-xr-xtests/gnits2.test4
-rwxr-xr-xtests/gnits3.test4
-rwxr-xr-xtests/gnumake.test4
-rwxr-xr-xtests/gnuwarn.test4
-rwxr-xr-xtests/gnuwarn2.test4
-rwxr-xr-xtests/header.test4
-rwxr-xr-xtests/help.test4
-rwxr-xr-xtests/hfs.test4
-rwxr-xr-xtests/hosts.test4
-rwxr-xr-xtests/implicit.test4
-rwxr-xr-xtests/include.test4
-rwxr-xr-xtests/include2.test4
-rwxr-xr-xtests/info.test4
-rwxr-xr-xtests/insh2.test4
-rwxr-xr-xtests/install2.test4
-rwxr-xr-xtests/installdir.test4
-rwxr-xr-xtests/instdat.test4
-rwxr-xr-xtests/instdat2.test4
-rwxr-xr-xtests/instexec.test4
-rwxr-xr-xtests/insthook.test4
-rwxr-xr-xtests/instman.test4
-rwxr-xr-xtests/instman2.test4
-rwxr-xr-xtests/instsh.test4
-rwxr-xr-xtests/instsh2.test4
-rwxr-xr-xtests/instspc.test4
-rwxr-xr-xtests/interp.test4
-rwxr-xr-xtests/interp2.test4
-rwxr-xr-xtests/java.test4
-rwxr-xr-xtests/java2.test4
-rwxr-xr-xtests/java3.test4
-rwxr-xr-xtests/javaprim.test4
-rwxr-xr-xtests/javasubst.test4
-rwxr-xr-xtests/ldadd.test4
-rwxr-xr-xtests/ldflags.test4
-rwxr-xr-xtests/lex.test4
-rwxr-xr-xtests/lex2.test4
-rwxr-xr-xtests/lex3.test4
-rwxr-xr-xtests/lex4.test4
-rwxr-xr-xtests/lex5.test4
-rwxr-xr-xtests/libobj10.test4
-rwxr-xr-xtests/libobj11.test4
-rwxr-xr-xtests/libobj12.test4
-rwxr-xr-xtests/libobj13.test4
-rwxr-xr-xtests/libobj14.test4
-rwxr-xr-xtests/libobj2.test4
-rwxr-xr-xtests/libobj3.test4
-rwxr-xr-xtests/libobj4.test4
-rwxr-xr-xtests/libobj5.test4
-rwxr-xr-xtests/libobj7.test4
-rwxr-xr-xtests/libobj8.test4
-rwxr-xr-xtests/library.test4
-rwxr-xr-xtests/library2.test4
-rwxr-xr-xtests/library3.test4
-rwxr-xr-xtests/libtool.test4
-rwxr-xr-xtests/libtool2.test4
-rwxr-xr-xtests/libtool3.test4
-rwxr-xr-xtests/libtool4.test4
-rwxr-xr-xtests/libtool5.test4
-rwxr-xr-xtests/libtool6.test4
-rwxr-xr-xtests/libtool7.test4
-rwxr-xr-xtests/libtool8.test4
-rwxr-xr-xtests/libtool9.test4
-rwxr-xr-xtests/license.test4
-rwxr-xr-xtests/link_c_cxx.test4
-rwxr-xr-xtests/link_dist.test4
-rwxr-xr-xtests/link_f90_only.test4
-rwxr-xr-xtests/link_f_only.test4
-rwxr-xr-xtests/link_fc.test4
-rwxr-xr-xtests/link_fccxx.test4
-rwxr-xr-xtests/link_fcxx.test4
-rwxr-xr-xtests/lisp2.test4
-rwxr-xr-xtests/lisp3.test4
-rwxr-xr-xtests/lisp4.test4
-rwxr-xr-xtests/lisp5.test4
-rwxr-xr-xtests/lisp6.test4
-rwxr-xr-xtests/lisp7.test4
-rwxr-xr-xtests/lisp8.test4
-rwxr-xr-xtests/listval.test4
-rwxr-xr-xtests/location.test4
-rwxr-xr-xtests/longlin2.test4
-rwxr-xr-xtests/longline.test4
-rwxr-xr-xtests/ltcond.test4
-rwxr-xr-xtests/ltcond2.test4
-rwxr-xr-xtests/ltconv.test4
-rwxr-xr-xtests/ltdeps.test4
-rwxr-xr-xtests/ltlibobjs.test4
-rwxr-xr-xtests/ltlibsrc.test4
-rwxr-xr-xtests/maintclean.test4
-rwxr-xr-xtests/make.test4
-rwxr-xr-xtests/makej.test4
-rwxr-xr-xtests/makevars.test4
-rwxr-xr-xtests/man.test4
-rwxr-xr-xtests/man2.test4
-rwxr-xr-xtests/mclean.test4
-rwxr-xr-xtests/mdate.test4
-rwxr-xr-xtests/mdate2.test4
-rwxr-xr-xtests/mdate3.test4
-rwxr-xr-xtests/mdate4.test4
-rwxr-xr-xtests/missing.test4
-rwxr-xr-xtests/missing2.test4
-rwxr-xr-xtests/missing3.test4
-rwxr-xr-xtests/mkinst2.test4
-rwxr-xr-xtests/mkinstall.test4
-rwxr-xr-xtests/mmodely.test4
-rwxr-xr-xtests/multlib.test4
-rwxr-xr-xtests/nobase.test4
-rwxr-xr-xtests/nodef.test4
-rwxr-xr-xtests/nodef2.test4
-rwxr-xr-xtests/nodep.test4
-rwxr-xr-xtests/nodepcomp.test4
-rwxr-xr-xtests/nodist.test4
-rwxr-xr-xtests/nodist2.test4
-rwxr-xr-xtests/nodist3.test4
-rwxr-xr-xtests/nogzip.test4
-rwxr-xr-xtests/nogzip2.test4
-rwxr-xr-xtests/noinst.test4
-rwxr-xr-xtests/noinstdir.test4
-rwxr-xr-xtests/nolink.test4
-rwxr-xr-xtests/nostdinc.test4
-rwxr-xr-xtests/number.test4
-rwxr-xr-xtests/obsolete.test4
-rwxr-xr-xtests/order.test4
-rwxr-xr-xtests/outdir.test4
-rwxr-xr-xtests/output.test4
-rwxr-xr-xtests/output10.test4
-rwxr-xr-xtests/output11.test4
-rwxr-xr-xtests/output12.test4
-rwxr-xr-xtests/output2.test4
-rwxr-xr-xtests/output3.test4
-rwxr-xr-xtests/output4.test4
-rwxr-xr-xtests/output5.test4
-rwxr-xr-xtests/output6.test4
-rwxr-xr-xtests/output7.test4
-rwxr-xr-xtests/output8.test4
-rwxr-xr-xtests/output9.test4
-rwxr-xr-xtests/overrid.test4
-rwxr-xr-xtests/parse.test4
-rwxr-xr-xtests/percent.test4
-rwxr-xr-xtests/percent2.test4
-rwxr-xr-xtests/phony.test4
-rwxr-xr-xtests/pluseq.test4
-rwxr-xr-xtests/pluseq10.test4
-rwxr-xr-xtests/pluseq2.test4
-rwxr-xr-xtests/pluseq3.test4
-rwxr-xr-xtests/pluseq4.test4
-rwxr-xr-xtests/pluseq5.test4
-rwxr-xr-xtests/pluseq6.test4
-rwxr-xr-xtests/pluseq7.test4
-rwxr-xr-xtests/pluseq8.test4
-rwxr-xr-xtests/pluseq9.test4
-rwxr-xr-xtests/postproc.test4
-rwxr-xr-xtests/ppf77.test4
-rwxr-xr-xtests/pr2.test4
-rwxr-xr-xtests/pr204.test4
-rwxr-xr-xtests/pr211.test4
-rwxr-xr-xtests/pr220.test4
-rwxr-xr-xtests/pr224.test4
-rwxr-xr-xtests/pr229.test4
-rwxr-xr-xtests/pr243.test4
-rwxr-xr-xtests/pr266.test4
-rwxr-xr-xtests/pr279-2.test4
-rwxr-xr-xtests/pr279.test4
-rwxr-xr-xtests/pr287.test4
-rwxr-xr-xtests/pr300-lib.test4
-rwxr-xr-xtests/pr300-ltlib.test4
-rwxr-xr-xtests/pr300-prog.test4
-rwxr-xr-xtests/pr307.test4
-rwxr-xr-xtests/pr401.test4
-rwxr-xr-xtests/pr401b.test4
-rwxr-xr-xtests/pr401c.test4
-rwxr-xr-xtests/pr72.test4
-rwxr-xr-xtests/pr87.test4
-rwxr-xr-xtests/pr9.test4
-rwxr-xr-xtests/prefix.test4
-rwxr-xr-xtests/primary.test4
-rwxr-xr-xtests/primary2.test4
-rwxr-xr-xtests/primary3.test4
-rwxr-xr-xtests/proginst.test4
-rwxr-xr-xtests/python.test4
-rwxr-xr-xtests/python10.test4
-rwxr-xr-xtests/python11.test4
-rwxr-xr-xtests/python12.test4
-rwxr-xr-xtests/python2.test4
-rwxr-xr-xtests/python3.test4
-rwxr-xr-xtests/python4.test4
-rwxr-xr-xtests/python5.test4
-rwxr-xr-xtests/python6.test4
-rwxr-xr-xtests/python7.test4
-rwxr-xr-xtests/python8.test4
-rwxr-xr-xtests/python9.test4
-rwxr-xr-xtests/recurs.test4
-rwxr-xr-xtests/recurs2.test4
-rwxr-xr-xtests/regex.test4
-rwxr-xr-xtests/remake.test4
-rwxr-xr-xtests/remake2.test4
-rwxr-xr-xtests/remake3.test4
-rwxr-xr-xtests/remake4.test4
-rwxr-xr-xtests/remake5.test4
-rwxr-xr-xtests/req.test4
-rwxr-xr-xtests/reqd.test4
-rwxr-xr-xtests/reqd2.test4
-rwxr-xr-xtests/rulepat.test4
-rwxr-xr-xtests/scripts.test4
-rwxr-xr-xtests/seenc.test4
-rwxr-xr-xtests/sinclude.test4
-rwxr-xr-xtests/space.test4
-rwxr-xr-xtests/specflg.test4
-rwxr-xr-xtests/specflg2.test4
-rwxr-xr-xtests/specflg3.test4
-rwxr-xr-xtests/specflg6.test4
-rwxr-xr-xtests/specflg7.test4
-rwxr-xr-xtests/specflg8.test4
-rwxr-xr-xtests/specflg9.test4
-rwxr-xr-xtests/spell.test4
-rwxr-xr-xtests/spell2.test4
-rwxr-xr-xtests/spell3.test4
-rwxr-xr-xtests/spelling.test4
-rwxr-xr-xtests/spy.test4
-rwxr-xr-xtests/srcsub.test4
-rwxr-xr-xtests/srcsub2.test4
-rwxr-xr-xtests/stamph2.test4
-rwxr-xr-xtests/stdlib.test4
-rwxr-xr-xtests/stdlib2.test4
-rwxr-xr-xtests/strip.test4
-rwxr-xr-xtests/subcond.test4
-rwxr-xr-xtests/subcond2.test4
-rwxr-xr-xtests/subcond3.test4
-rwxr-xr-xtests/subdir.test4
-rwxr-xr-xtests/subdir2.test4
-rwxr-xr-xtests/subdir3.test4
-rwxr-xr-xtests/subdir4.test4
-rwxr-xr-xtests/subdir5.test4
-rwxr-xr-xtests/subdir6.test4
-rwxr-xr-xtests/subdir7.test4
-rwxr-xr-xtests/subdir8.test4
-rwxr-xr-xtests/subdir9.test4
-rwxr-xr-xtests/subdirbuiltsources.test4
-rwxr-xr-xtests/subobj.test4
-rwxr-xr-xtests/subobj2.test4
-rwxr-xr-xtests/subobj3.test4
-rwxr-xr-xtests/subobj4.test4
-rwxr-xr-xtests/subobj5.test4
-rwxr-xr-xtests/subobj6.test4
-rwxr-xr-xtests/subobj7.test4
-rwxr-xr-xtests/subobj8.test4
-rwxr-xr-xtests/subobj9.test4
-rwxr-xr-xtests/subobjname.test4
-rwxr-xr-xtests/subpkg.test4
-rwxr-xr-xtests/subpkg2.test4
-rwxr-xr-xtests/subst.test4
-rwxr-xr-xtests/subst2.test4
-rwxr-xr-xtests/substre2.test4
-rwxr-xr-xtests/substref.test4
-rwxr-xr-xtests/substtarg.test4
-rwxr-xr-xtests/suffix.test4
-rwxr-xr-xtests/suffix10.test4
-rwxr-xr-xtests/suffix11.test4
-rwxr-xr-xtests/suffix2.test4
-rwxr-xr-xtests/suffix3.test4
-rwxr-xr-xtests/suffix4.test4
-rwxr-xr-xtests/suffix5.test4
-rwxr-xr-xtests/suffix6.test4
-rwxr-xr-xtests/suffix7.test4
-rwxr-xr-xtests/suffix8.test4
-rwxr-xr-xtests/suffix9.test4
-rwxr-xr-xtests/symlink.test4
-rwxr-xr-xtests/symlink2.test4
-rwxr-xr-xtests/symlink3.test4
-rwxr-xr-xtests/syntax.test4
-rwxr-xr-xtests/tags.test4
-rwxr-xr-xtests/tagsub.test4
-rwxr-xr-xtests/tar.test4
-rwxr-xr-xtests/tar2.test4
-rwxr-xr-xtests/tar3.test4
-rwxr-xr-xtests/target-cflags.test4
-rwxr-xr-xtests/targetclash.test4
-rwxr-xr-xtests/transform.test4
-rwxr-xr-xtests/txinfo.test4
-rwxr-xr-xtests/txinfo10.test4
-rwxr-xr-xtests/txinfo13.test4
-rwxr-xr-xtests/txinfo16.test4
-rwxr-xr-xtests/txinfo17.test4
-rwxr-xr-xtests/txinfo18.test4
-rwxr-xr-xtests/txinfo19.test4
-rwxr-xr-xtests/txinfo2.test4
-rwxr-xr-xtests/txinfo20.test4
-rwxr-xr-xtests/txinfo21.test4
-rwxr-xr-xtests/txinfo22.test4
-rwxr-xr-xtests/txinfo23.test4
-rwxr-xr-xtests/txinfo24.test4
-rwxr-xr-xtests/txinfo25.test4
-rwxr-xr-xtests/txinfo26.test4
-rwxr-xr-xtests/txinfo27.test4
-rwxr-xr-xtests/txinfo28.test4
-rwxr-xr-xtests/txinfo29.test4
-rwxr-xr-xtests/txinfo3.test4
-rwxr-xr-xtests/txinfo4.test4
-rwxr-xr-xtests/txinfo5.test4
-rwxr-xr-xtests/txinfo6.test4
-rwxr-xr-xtests/txinfo7.test4
-rwxr-xr-xtests/txinfo8.test4
-rwxr-xr-xtests/txinfo9.test4
-rwxr-xr-xtests/unused.test4
-rwxr-xr-xtests/vars.test4
-rwxr-xr-xtests/vars3.test4
-rwxr-xr-xtests/vartar.test4
-rwxr-xr-xtests/version.test4
-rwxr-xr-xtests/version2.test4
-rwxr-xr-xtests/version3.test4
-rwxr-xr-xtests/version4.test4
-rwxr-xr-xtests/version6.test4
-rwxr-xr-xtests/version7.test4
-rwxr-xr-xtests/version8.test4
-rwxr-xr-xtests/vpath.test4
-rwxr-xr-xtests/vtexi.test4
-rwxr-xr-xtests/vtexi2.test4
-rwxr-xr-xtests/warnopts.test4
-rwxr-xr-xtests/werror.test4
-rwxr-xr-xtests/werror2.test4
-rwxr-xr-xtests/whoami.test4
-rwxr-xr-xtests/xsource.test4
-rwxr-xr-xtests/yacc.test4
-rwxr-xr-xtests/yacc2.test4
-rwxr-xr-xtests/yacc3.test4
-rwxr-xr-xtests/yacc4.test4
-rwxr-xr-xtests/yacc5.test4
-rwxr-xr-xtests/yacc6.test4
-rwxr-xr-xtests/yacc7.test4
-rwxr-xr-xtests/yacc8.test4
-rwxr-xr-xtests/yaccpp.test4
-rwxr-xr-xtests/yaccvpath.test4
682 files changed, 1887 insertions, 1586 deletions
diff --git a/COPYING b/COPYING
index d60c31a97..3912109b5 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
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
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/ChangeLog b/ChangeLog
index 721ed4a07..277473833 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,235 @@
2005-05-14 Alexandre Duret-Lutz <adl@gnu.org>
+ * COPYING, ChangeLog, ChangeLog.00, ChangeLog.01, ChangeLog.02,
+ ChangeLog.03, ChangeLog.96, ChangeLog.98, HACKING, Makefile.am,
+ NEWS, README, TODO, aclocal.in, automake.in, bootstrap, configure,
+ configure.ac, doc/Makefile.am, doc/fdl.texi, lib/COPYING,
+ lib/Makefile.am, lib/acinstall, lib/compile, lib/config-ml.in,
+ lib/config.guess, lib/config.sub, lib/depcomp, lib/elisp-comp,
+ lib/gnupload, lib/mdate-sh, lib/missing, lib/py-compile,
+ lib/symlink-tree, lib/texinfo.tex, lib/ylwrap,
+ lib/Automake/ChannelDefs.pm, lib/Automake/Channels.pm,
+ lib/Automake/Condition.pm, lib/Automake/Config.in,
+ lib/Automake/Configure_ac.pm, lib/Automake/DisjConditions.pm,
+ lib/Automake/FileUtils.pm, lib/Automake/General.pm,
+ lib/Automake/Item.pm, lib/Automake/ItemDef.pm,
+ lib/Automake/Location.pm, lib/Automake/Makefile.am,
+ lib/Automake/Options.pm, lib/Automake/Rule.pm,
+ lib/Automake/RuleDef.pm, lib/Automake/Struct.pm,
+ lib/Automake/VarDef.pm, lib/Automake/Variable.pm,
+ lib/Automake/Version.pm, lib/Automake/Wrap.pm,
+ lib/Automake/XFile.pm, lib/Automake/tests/Condition.pl,
+ lib/Automake/tests/DisjConditions.pl,
+ lib/Automake/tests/Makefile.am, lib/Automake/tests/Version.pl,
+ lib/Automake/tests/Wrap.pl, lib/am/Makefile.am,
+ lib/am/ansi2knr.am, lib/am/check.am, lib/am/clean-hdr.am,
+ lib/am/clean.am, lib/am/compile.am, lib/am/configure.am,
+ lib/am/data.am, lib/am/dejagnu.am, lib/am/depend.am,
+ lib/am/depend2.am, lib/am/distdir.am, lib/am/footer.am,
+ lib/am/header-vars.am, lib/am/header.am, lib/am/inst-vars.am,
+ lib/am/install.am, lib/am/java.am, lib/am/lang-compile.am,
+ lib/am/lex.am, lib/am/library.am, lib/am/libs.am,
+ lib/am/libtool.am, lib/am/lisp.am, lib/am/ltlib.am,
+ lib/am/ltlibrary.am, lib/am/mans-vars.am, lib/am/mans.am,
+ lib/am/multilib.am, lib/am/program.am, lib/am/progs.am,
+ lib/am/python.am, lib/am/remake-hdr.am, lib/am/scripts.am,
+ lib/am/subdirs.am, lib/am/tags.am, lib/am/texi-vers.am,
+ lib/am/texibuild.am, lib/am/texinfos.am, lib/am/yacc.am,
+ m4/Makefile.am, tests/aclibobj.test, tests/acloca10.test,
+ tests/acloca11.test, tests/acloca12.test, tests/acloca13.test,
+ tests/acloca14.test, tests/acloca15.test, tests/acloca16.test,
+ tests/acloca17.test, tests/acloca18.test, tests/acloca19.test,
+ tests/aclocal.test, tests/aclocal3.test, tests/aclocal4.test,
+ tests/aclocal5.test, tests/aclocal6.test, tests/aclocal7.test,
+ tests/aclocal8.test, tests/aclocal9.test, tests/acoutbs.test,
+ tests/acoutbs2.test, tests/acoutnoq.test, tests/acoutpt.test,
+ tests/acoutpt2.test, tests/acoutqnl.test, tests/acsilent.test,
+ tests/acsubst.test, tests/acsubst2.test, tests/all.test,
+ tests/alloca.test, tests/alloca2.test, tests/alpha.test,
+ tests/alpha2.test, tests/amassign.test, tests/ammissing.test,
+ tests/ansi.test, tests/ansi10.test, tests/ansi2.test,
+ tests/ansi3.test, tests/ansi3b.test, tests/ansi4.test,
+ tests/ansi5.test, tests/ansi6.test, tests/ansi7.test,
+ tests/ansi8.test, tests/ansi9.test, tests/ar.test, tests/ar2.test,
+ tests/asm.test, tests/autohdr.test, tests/autohdr2.test,
+ tests/autohdr3.test, tests/autohdr4.test, tests/automake.test,
+ tests/auxdir.test, tests/auxdir2.test, tests/auxdir3.test,
+ tests/auxdir4.test, tests/backsl.test, tests/backsl2.test,
+ tests/backsl3.test, tests/backsl4.test, tests/badline.test,
+ tests/badopt.test, tests/badprog.test, tests/block.test,
+ tests/bsource.test, tests/canon.test, tests/canon2.test,
+ tests/canon3.test, tests/canon4.test, tests/canon5.test,
+ tests/ccnoco.test, tests/check.test, tests/check2.test,
+ tests/check3.test, tests/check4.test, tests/checkall.test,
+ tests/clean.test, tests/clean2.test, tests/colneq.test,
+ tests/colneq2.test, tests/colon.test, tests/colon2.test,
+ tests/colon3.test, tests/colon4.test, tests/colon5.test,
+ tests/colon6.test, tests/colon7.test, tests/comment.test,
+ tests/comment2.test, tests/comment3.test, tests/comment4.test,
+ tests/comment5.test, tests/comment6.test, tests/comment7.test,
+ tests/comment8.test, tests/comment9.test, tests/compile.test,
+ tests/compile_f90_c_cxx.test, tests/compile_f_c_cxx.test,
+ tests/cond.test, tests/cond10.test, tests/cond11.test,
+ tests/cond13.test, tests/cond14.test, tests/cond15.test,
+ tests/cond16.test, tests/cond17.test, tests/cond18.test,
+ tests/cond19.test, tests/cond2.test, tests/cond20.test,
+ tests/cond21.test, tests/cond22.test, tests/cond23.test,
+ tests/cond24.test, tests/cond25.test, tests/cond26.test,
+ tests/cond27.test, tests/cond28.test, tests/cond29.test,
+ tests/cond3.test, tests/cond30.test, tests/cond31.test,
+ tests/cond32.test, tests/cond33.test, tests/cond34.test,
+ tests/cond35.test, tests/cond36.test, tests/cond37.test,
+ tests/cond4.test, tests/cond5.test, tests/cond6.test,
+ tests/cond7.test, tests/cond8.test, tests/cond9.test,
+ tests/condd.test, tests/condhook.test, tests/condinc.test,
+ tests/condinc2.test, tests/condlib.test, tests/condman.test,
+ tests/condman2.test, tests/conf2.test, tests/confdeps.test,
+ tests/conff.test, tests/conff2.test, tests/confh.test,
+ tests/confh4.test, tests/confh5.test, tests/config.test,
+ tests/confincl.test, tests/conflnk.test, tests/conflnk2.test,
+ tests/conflnk3.test, tests/confsub.test, tests/confvar.test,
+ tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
+ tests/cxx.test, tests/cxx2.test, tests/cxxansi.test,
+ tests/cxxcpp.test, tests/cxxlibobj.test, tests/cxxlink.test,
+ tests/cxxnoc.test, tests/cxxo.test, tests/cygwin32.test,
+ tests/dash.test, tests/defs.in, tests/defun.test,
+ tests/defun2.test, tests/dejagnu.test, tests/dejagnu2.test,
+ tests/dejagnu3.test, tests/dejagnu4.test, tests/dejagnu5.test,
+ tests/dejagnu6.test, tests/dejagnu7.test, tests/depacl2.test,
+ tests/depcomp.test, tests/depcomp2.test, tests/depcomp3.test,
+ tests/depcomp4.test, tests/depcomp5.test, tests/depdist.test,
+ tests/depend.test, tests/depend2.test, tests/depend3.test,
+ tests/depend4.test, tests/destdir.test, tests/dirforbid.test,
+ tests/dirlist.test, tests/discover.test, tests/distcom2.test,
+ tests/distcom3.test, tests/distcom4.test, tests/distcom5.test,
+ tests/distcom6.test, tests/distcom7.test, tests/distdir.test,
+ tests/distname.test, tests/dollar.test, tests/double.test,
+ tests/dup2.test, tests/else.test, tests/empty.test,
+ tests/empty2.test, tests/empty3.test, tests/empty4.test,
+ tests/exdir.test, tests/exdir2.test, tests/exeext.test,
+ tests/exeext2.test, tests/exeext3.test, tests/exeext4.test,
+ tests/exsource.test, tests/ext.test, tests/ext2.test,
+ tests/extra.test, tests/extra2.test, tests/extra3.test,
+ tests/extra4.test, tests/extra5.test, tests/extra6.test,
+ tests/extra7.test, tests/f90only.test, tests/flibs.test,
+ tests/fn99.test, tests/fnoc.test, tests/fo.test, tests/fonly.test,
+ tests/fortdep.test, tests/fpinst2.test, tests/fpinstall.test,
+ tests/gcj.test, tests/gcj2.test, tests/gcj3.test, tests/gcj4.test,
+ tests/gcj5.test, tests/getopt.test, tests/gettext.test,
+ tests/gettext2.test, tests/gnits.test, tests/gnits2.test,
+ tests/gnits3.test, tests/gnumake.test, tests/gnuwarn.test,
+ tests/gnuwarn2.test, tests/header.test, tests/help.test,
+ tests/hfs.test, tests/hosts.test, tests/implicit.test,
+ tests/include.test, tests/include2.test, tests/info.test,
+ tests/insh2.test, tests/install2.test, tests/installdir.test,
+ tests/instdat.test, tests/instdat2.test, tests/instexec.test,
+ tests/insthook.test, tests/instman.test, tests/instman2.test,
+ tests/instsh.test, tests/instsh2.test, tests/instspc.test,
+ tests/interp.test, tests/interp2.test, tests/java.test,
+ tests/java2.test, tests/java3.test, tests/javaprim.test,
+ tests/javasubst.test, tests/ldadd.test, tests/ldflags.test,
+ tests/lex.test, tests/lex2.test, tests/lex3.test, tests/lex4.test,
+ tests/lex5.test, tests/libobj10.test, tests/libobj11.test,
+ tests/libobj12.test, tests/libobj13.test, tests/libobj14.test,
+ tests/libobj2.test, tests/libobj3.test, tests/libobj4.test,
+ tests/libobj5.test, tests/libobj7.test, tests/libobj8.test,
+ tests/library.test, tests/library2.test, tests/library3.test,
+ tests/libtool.test, tests/libtool2.test, tests/libtool3.test,
+ tests/libtool4.test, tests/libtool5.test, tests/libtool6.test,
+ tests/libtool7.test, tests/libtool8.test, tests/libtool9.test,
+ tests/license.test, tests/link_c_cxx.test, tests/link_dist.test,
+ tests/link_f90_only.test, tests/link_f_only.test,
+ tests/link_fc.test, tests/link_fccxx.test, tests/link_fcxx.test,
+ tests/lisp2.test, tests/lisp3.test, tests/lisp4.test,
+ tests/lisp5.test, tests/lisp6.test, tests/lisp7.test,
+ tests/lisp8.test, tests/listval.test, tests/location.test,
+ tests/longlin2.test, tests/longline.test, tests/ltcond.test,
+ tests/ltcond2.test, tests/ltconv.test, tests/ltdeps.test,
+ tests/ltlibobjs.test, tests/ltlibsrc.test, tests/maintclean.test,
+ tests/make.test, tests/makej.test, tests/makevars.test,
+ tests/man.test, tests/man2.test, tests/mclean.test,
+ tests/mdate.test, tests/mdate2.test, tests/mdate3.test,
+ tests/mdate4.test, tests/missing.test, tests/missing2.test,
+ tests/missing3.test, tests/mkinst2.test, tests/mkinstall.test,
+ tests/mmodely.test, tests/multlib.test, tests/nobase.test,
+ tests/nodef.test, tests/nodef2.test, tests/nodep.test,
+ tests/nodepcomp.test, tests/nodist.test, tests/nodist2.test,
+ tests/nodist3.test, tests/nogzip.test, tests/nogzip2.test,
+ tests/noinst.test, tests/noinstdir.test, tests/nolink.test,
+ tests/nostdinc.test, tests/number.test, tests/obsolete.test,
+ tests/order.test, tests/outdir.test, tests/output.test,
+ tests/output10.test, tests/output11.test, tests/output12.test,
+ tests/output2.test, tests/output3.test, tests/output4.test,
+ tests/output5.test, tests/output6.test, tests/output7.test,
+ tests/output8.test, tests/output9.test, tests/overrid.test,
+ tests/parse.test, tests/percent.test, tests/percent2.test,
+ tests/phony.test, tests/pluseq.test, tests/pluseq10.test,
+ tests/pluseq2.test, tests/pluseq3.test, tests/pluseq4.test,
+ tests/pluseq5.test, tests/pluseq6.test, tests/pluseq7.test,
+ tests/pluseq8.test, tests/pluseq9.test, tests/postproc.test,
+ tests/ppf77.test, tests/pr2.test, tests/pr204.test,
+ tests/pr211.test, tests/pr220.test, tests/pr224.test,
+ tests/pr229.test, tests/pr243.test, tests/pr266.test,
+ tests/pr279-2.test, tests/pr279.test, tests/pr287.test,
+ tests/pr300-lib.test, tests/pr300-ltlib.test,
+ tests/pr300-prog.test, tests/pr307.test, tests/pr401.test,
+ tests/pr401b.test, tests/pr401c.test, tests/pr72.test,
+ tests/pr87.test, tests/pr9.test, tests/prefix.test,
+ tests/primary.test, tests/primary2.test, tests/primary3.test,
+ tests/proginst.test, tests/python.test, tests/python10.test,
+ tests/python11.test, tests/python12.test, tests/python2.test,
+ tests/python3.test, tests/python4.test, tests/python5.test,
+ tests/python6.test, tests/python7.test, tests/python8.test,
+ tests/python9.test, tests/recurs.test, tests/recurs2.test,
+ tests/regex.test, tests/remake.test, tests/remake2.test,
+ tests/remake3.test, tests/remake4.test, tests/remake5.test,
+ tests/req.test, tests/reqd.test, tests/reqd2.test,
+ tests/rulepat.test, tests/scripts.test, tests/seenc.test,
+ tests/sinclude.test, tests/space.test, tests/specflg.test,
+ tests/specflg2.test, tests/specflg3.test, tests/specflg6.test,
+ tests/specflg7.test, tests/specflg8.test, tests/specflg9.test,
+ tests/spell.test, tests/spell2.test, tests/spell3.test,
+ tests/spelling.test, tests/spy.test, tests/srcsub.test,
+ tests/srcsub2.test, tests/stamph2.test, tests/stdlib.test,
+ tests/stdlib2.test, tests/strip.test, tests/subcond.test,
+ tests/subcond2.test, tests/subcond3.test, tests/subdir.test,
+ tests/subdir2.test, tests/subdir3.test, tests/subdir4.test,
+ tests/subdir5.test, tests/subdir6.test, tests/subdir7.test,
+ tests/subdir8.test, tests/subdir9.test,
+ tests/subdirbuiltsources.test, tests/subobj.test,
+ tests/subobj2.test, tests/subobj3.test, tests/subobj4.test,
+ tests/subobj5.test, tests/subobj6.test, tests/subobj7.test,
+ tests/subobj8.test, tests/subobj9.test, tests/subobjname.test,
+ tests/subpkg.test, tests/subpkg2.test, tests/subst.test,
+ tests/subst2.test, tests/substre2.test, tests/substref.test,
+ tests/substtarg.test, tests/suffix.test, tests/suffix10.test,
+ tests/suffix11.test, tests/suffix2.test, tests/suffix3.test,
+ tests/suffix4.test, tests/suffix5.test, tests/suffix6.test,
+ tests/suffix7.test, tests/suffix8.test, tests/suffix9.test,
+ tests/symlink.test, tests/symlink2.test, tests/symlink3.test,
+ tests/syntax.test, tests/tags.test, tests/tagsub.test,
+ tests/tar.test, tests/tar2.test, tests/tar3.test,
+ tests/target-cflags.test, tests/targetclash.test,
+ tests/transform.test, tests/txinfo.test, tests/txinfo10.test,
+ tests/txinfo13.test, tests/txinfo16.test, tests/txinfo17.test,
+ tests/txinfo18.test, tests/txinfo19.test, tests/txinfo2.test,
+ tests/txinfo20.test, tests/txinfo21.test, tests/txinfo22.test,
+ tests/txinfo23.test, tests/txinfo24.test, tests/txinfo25.test,
+ tests/txinfo26.test, tests/txinfo27.test, tests/txinfo28.test,
+ tests/txinfo29.test, tests/txinfo3.test, tests/txinfo4.test,
+ tests/txinfo5.test, tests/txinfo6.test, tests/txinfo7.test,
+ tests/txinfo8.test, tests/txinfo9.test, tests/unused.test,
+ tests/vars.test, tests/vars3.test, tests/vartar.test,
+ tests/version.test, tests/version2.test, tests/version3.test,
+ tests/version4.test, tests/version6.test, tests/version7.test,
+ tests/version8.test, tests/vpath.test, tests/vtexi.test,
+ tests/vtexi2.test, tests/warnopts.test, tests/werror.test,
+ tests/werror2.test, tests/whoami.test, tests/xsource.test,
+ tests/yacc.test, tests/yacc2.test, tests/yacc3.test,
+ tests/yacc4.test, tests/yacc5.test, tests/yacc6.test,
+ tests/yacc7.test, tests/yacc8.test, tests/yaccpp.test,
+ tests/yaccvpath.test: Update FSF postal mail address.
+
* tests/cxxnoc.test: Adjust grep pattern for CC, because CVS
Autoconf currently defines a CCC variable.
@@ -2019,8 +2249,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with autoconf; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
;; Variables:
;; coding: utf-8
diff --git a/ChangeLog.00 b/ChangeLog.00
index 01111ef8c..2233e2dda 100644
--- a/ChangeLog.00
+++ b/ChangeLog.00
@@ -2221,5 +2221,5 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with autoconf; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/ChangeLog.01 b/ChangeLog.01
index e0dc01e3c..69ca023e4 100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@ -4947,5 +4947,5 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with autoconf; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/ChangeLog.02 b/ChangeLog.02
index 58e1007b6..af1a797e8 100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@ -3235,5 +3235,5 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with autoconf; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/ChangeLog.03 b/ChangeLog.03
index 81d452eec..b8f555a2c 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -2981,5 +2981,5 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with autoconf; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/ChangeLog.96 b/ChangeLog.96
index c8de8c174..037933ff0 100644
--- a/ChangeLog.96
+++ b/ChangeLog.96
@@ -3695,5 +3695,5 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with autoconf; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/ChangeLog.98 b/ChangeLog.98
index 918c21726..0729d57f0 100644
--- a/ChangeLog.98
+++ b/ChangeLog.98
@@ -2201,5 +2201,5 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with autoconf; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/HACKING b/HACKING
index 0291897b8..d192f3f7a 100644
--- a/HACKING
+++ b/HACKING
@@ -160,8 +160,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with autoconf; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
Local Variables:
mode: text
diff --git a/Makefile.am b/Makefile.am
index 2a4c0771f..17b4a4e36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## We need `.' in SUBDIRS because we want `check' to build `.' before
## tests.
diff --git a/NEWS b/NEWS
index d7cb4d58f..fae9944d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1172,5 +1172,5 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Automake; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/README b/README
index 00d4aef33..086356572 100644
--- a/README
+++ b/README
@@ -53,5 +53,5 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with autoconf; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/TODO b/TODO
index 58be1a120..2f6aa2ac5 100644
--- a/TODO
+++ b/TODO
@@ -583,8 +583,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with autoconf; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
Local Variables:
diff --git a/aclocal.in b/aclocal.in
index b139c52fb..1990ff21f 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -22,8 +22,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# Written by Tom Tromey <tromey@redhat.com>, and
# Alexandre Duret-Lutz <adl@gnu.org>.
diff --git a/automake.in b/automake.in
index c735c1fdd..eaf5c6609 100755
--- a/automake.in
+++ b/automake.in
@@ -21,8 +21,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# Originally written by David Mackenzie <djm@gnu.ai.mit.edu>.
# Perl reimplementation by Tom Tromey <tromey@redhat.com>, and
diff --git a/bootstrap b/bootstrap
index 095fc9215..b1256bf24 100755
--- a/bootstrap
+++ b/bootstrap
@@ -17,7 +17,7 @@
#
# 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.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Find the path separator
echo "#! /bin/sh" >boot$$.sh
diff --git a/configure b/configure
index 8fb2df319..f408b99aa 100755
--- a/configure
+++ b/configure
@@ -4,8 +4,8 @@
#
# Report bugs to <bug-automake@gnu.org>.
#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -137,45 +137,52 @@ else
fi
if test $as_have_required = yes && (eval ":
-(func_return () {
+(as_func_return () {
(exit \$1)
}
-func_success () {
- func_return 0
+as_func_success () {
+ as_func_return 0
}
-func_failure () {
- func_return 1
+as_func_failure () {
+ as_func_return 1
}
-func_ret_success () {
+as_func_ret_success () {
return 0
}
-func_ret_failure () {
+as_func_ret_failure () {
return 1
}
exitcode=0
-if func_success; then
+if as_func_success; then
:
else
exitcode=1
- echo func_failure succeeded.
+ echo as_func_failure succeeded.
fi
-if func_failure; then
+if as_func_failure; then
exitcode=1
- echo func_success failed.
+ echo as_func_success failed.
fi
-if func_ret_success; then
+if as_func_ret_success; then
:
else
exitcode=1
- echo func_ret_success failed.
+ echo as_func_ret_success failed.
fi
-if func_ret_failure; then
+if as_func_ret_failure; then
exitcode=1
- echo func_ret_failure succeeded.
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
fi
test \$exitcode = 0) || { (exit 1); exit 1; }
@@ -183,9 +190,8 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
(
as_lineno_1=\$LINENO
as_lineno_2=\$LINENO
- as_lineno_3=\`(expr \$as_lineno_1 + 1) 2>/dev/null\`
test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\$as_lineno_3\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
") 2> /dev/null; then
:
else
@@ -241,45 +247,52 @@ BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
:
-(func_return () {
+(as_func_return () {
(exit $1)
}
-func_success () {
- func_return 0
+as_func_success () {
+ as_func_return 0
}
-func_failure () {
- func_return 1
+as_func_failure () {
+ as_func_return 1
}
-func_ret_success () {
+as_func_ret_success () {
return 0
}
-func_ret_failure () {
+as_func_ret_failure () {
return 1
}
exitcode=0
-if func_success; then
+if as_func_success; then
:
else
exitcode=1
- echo func_failure succeeded.
+ echo as_func_failure succeeded.
fi
-if func_failure; then
+if as_func_failure; then
exitcode=1
- echo func_success failed.
+ echo as_func_success failed.
fi
-if func_ret_success; then
+if as_func_ret_success; then
:
else
exitcode=1
- echo func_ret_success failed.
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
fi
-if func_ret_failure; then
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+ :
+else
exitcode=1
- echo func_ret_failure succeeded.
+ echo positional parameters were not saved.
fi
test $exitcode = 0) || { (exit 1); exit 1; }
@@ -287,9 +300,8 @@ test $exitcode = 0) || { (exit 1); exit 1; }
(
as_lineno_1=$LINENO
as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2") || { (exit 1); exit 1; }
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
_ASEOF
}; then
@@ -324,45 +336,52 @@ fi
-(eval "func_return () {
+(eval "as_func_return () {
(exit \$1)
}
-func_success () {
- func_return 0
+as_func_success () {
+ as_func_return 0
}
-func_failure () {
- func_return 1
+as_func_failure () {
+ as_func_return 1
}
-func_ret_success () {
+as_func_ret_success () {
return 0
}
-func_ret_failure () {
+as_func_ret_failure () {
return 1
}
exitcode=0
-if func_success; then
+if as_func_success; then
:
else
exitcode=1
- echo func_failure succeeded.
+ echo as_func_failure succeeded.
fi
-if func_failure; then
+if as_func_failure; then
exitcode=1
- echo func_success failed.
+ echo as_func_success failed.
fi
-if func_ret_success; then
+if as_func_ret_success; then
:
else
exitcode=1
- echo func_ret_success failed.
+ echo as_func_ret_success failed.
fi
-if func_ret_failure; then
+if as_func_ret_failure; then
exitcode=1
- echo func_ret_failure succeeded.
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
fi
test \$exitcode = 0") || {
@@ -376,9 +395,8 @@ test \$exitcode = 0") || {
as_lineno_1=$LINENO
as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
# uniformly replaced by the line number. The first 'sed' inserts a
@@ -418,11 +436,15 @@ test \$exitcode = 0") || {
}
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
if expr a : '\(a\)' >/dev/null 2>&1; then
@@ -487,13 +509,13 @@ IFS=" $as_nl"
$as_unset CDPATH
+exec 7<&0 </dev/null 6>&1
+
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-exec 6>&1
-
#
# Initializations.
#
@@ -518,7 +540,81 @@ PACKAGE_STRING='GNU Automake 1.9a'
PACKAGE_BUGREPORT='bug-automake@gnu.org'
ac_unique_file="automake.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir localstatedir includedir oldincludedir docdir infodir htmldir dvidir pdfdir psdir libdir localedir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os am_AUTOCONF INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+build_alias
+host_alias
+target_alias
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build
+build_cpu
+build_vendor
+build_os
+am_AUTOCONF
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+ac_ct_STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+APIVERSION
+pkgvdatadir
+PERL
+TEX
+LN
+MODIFICATION_DELAY
+GREP
+EGREP
+FGREP
+LIBOBJS
+LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -627,6 +723,11 @@ do
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
eval "enable_$ac_feature=no" ;;
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+ docdir=$ac_optarg ;;
+
-dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
ac_prev=dvidir ;;
-dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
@@ -906,28 +1007,18 @@ if test -n "$ac_prev"; then
fi
# Be sure to have absolute directory names.
-for ac_var in exec_prefix prefix
-do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
- esac
-done
-
-# Be sure to have absolute directory names.
-for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir \
- sharedstatedir localstatedir includedir oldincludedir \
- docdir infodir htmldir dvidir pdfdir psdir libdir \
- localedir mandir
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
do
eval ac_val=$`echo $ac_var`
case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; }
done
# There might be people who depend on the old broken behavior: `$host'
@@ -990,6 +1081,42 @@ fi
{ echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
{ (exit 1); exit 1; }; }
srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+
+ac_pwd=`pwd` && test -n "$ac_pwd" ||
+ { echo "$as_me: error: Working directory cannot be determined" >&2
+ { (exit 1); exit 1; }; }
+
+ac_pat="[\$][{][_$as_cr_Letters][_$as_cr_alnum]*[}]"
+
+for ac_dir in "$ac_pwd" "$srcdir" \
+ "$bindir" "$sbindir" "$libexecdir" "$datarootdir" "$datadir" \
+ "$sysconfdir" "$sharedstatedir" "$localstatedir" "$includedir" \
+ "$oldincludedir" "$docdir" "$infodir" "$htmldir" "$dvidir" "$pdfdir" \
+ "$psdir" "$libdir" "$localedir" "$mandir"
+do
+ # Remove references to shell or make variables.
+ ac_dirx=$ac_dir
+ while :
+ do
+ case $ac_dirx in
+ *\${*}*)
+ ac_dirx=`
+ expr "X$ac_dirx" : "X\\(.*\\)$ac_pat"`X`
+ expr "X$ac_dirx" : "X.*$ac_pat\\(.*\\)"`;;
+ *) break;;
+ esac
+ done
+
+ # Check for newline, tab, space, and other weird possibilities.
+ # Preserve that tab character below!
+ case $ac_dirx in
+ '' | -* | */-* | *'
+'* | *' '* | *' '* | *\"* | *\#* | *\ | *\&* | *\'* | *\(* | *\)* | \
+ *\** | *\;* | *\<* | *\=* | *\>* | *\?* | *\[* | *\\* | *\`* | \
+ *\|* | \~*)
+ echo "$as_me: WARNING: Directory name \`$ac_dir' contains special characters" >&2;;
+ esac
+done
ac_env_build_alias_set=${build_alias+set}
ac_env_build_alias_value=$build_alias
ac_cv_env_build_alias_set=${build_alias+set}
@@ -1088,11 +1215,11 @@ if test -n "$ac_init_help"; then
Report bugs to <bug-automake@gnu.org>.
_ACEOF
+ac_status=$?
fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
- ac_popdir=`pwd`
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
test -d $ac_dir || continue
ac_builddir=.
@@ -1104,6 +1231,8 @@ if test "$ac_dir" != .; then
else
ac_dir_suffix= ac_top_builddir=
fi
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
case $srcdir in
.) # No --srcdir option. We are building in place.
@@ -1112,85 +1241,50 @@ case $srcdir in
ac_top_srcdir=.
else
ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
+ fi
+ ac_abs_top_srcdir=$ac_pwd ;;
[\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
*) # Relative name.
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ ac_top_srcdir=$ac_top_builddir$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-# Do not use `cd foo && pwd` to compute absolute names, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
-
- cd $ac_dir
+ cd $ac_dir || { ac_status=$?; continue; }
# Check for guested configure; otherwise get Cygnus style configure.
if test -f $ac_srcdir/configure.gnu; then
- echo
+ echo &&
$SHELL $ac_srcdir/configure.gnu --help=recursive
elif test -f $ac_srcdir/configure; then
- echo
+ echo &&
$SHELL $ac_srcdir/configure --help=recursive
elif test -f $ac_srcdir/configure.ac ||
test -f $ac_srcdir/configure.in; then
- echo
+ echo &&
$ac_configure --help
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
- cd "$ac_popdir"
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
done
fi
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
GNU Automake configure 1.9a
generated by GNU Autoconf 2.59c
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
-2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
- exit 0
+ exit
fi
exec 5>config.log
cat >&5 <<_ACEOF
@@ -1221,7 +1315,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown`
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
@@ -1374,7 +1468,7 @@ _ASBOX
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core *.core &&
+ rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
@@ -1537,6 +1631,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
ac_aux_dir=
for ac_dir in lib $srcdir/lib; do
if test -f $ac_dir/install-sh; then
@@ -1729,10 +1824,10 @@ fi
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
test "$program_prefix" != NONE &&
- program_transform_name="s,^,$program_prefix,;$program_transform_name"
+ program_transform_name="s|^|$program_prefix|;$program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+ program_transform_name="s|\$|$program_suffix|;$program_transform_name"
# Double any \ or $. echo might interpret backslashes.
# By default was `s,x,x', remove it if useless.
cat <<\_ACEOF >conftest.sed
@@ -2287,9 +2382,10 @@ do
{ test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
-if "$ac_path_GREP" --version 2>&1 < /dev/null | grep 'GNU' >/dev/null; then
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:
-else
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
while :
@@ -2309,8 +2405,8 @@ else
# 10*(2^10) chars as input seems more than enough
test $ac_count -gt 10 && break
done
- rm -f conftest.*
-fi
+ rm -f conftest.*;;
+esac
$ac_path_GREP_found && break 3
@@ -2345,7 +2441,7 @@ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
if test "${ac_cv_path_EGREP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if echo a | ($GREP -E '(a|b)') >/dev/null 2>&1
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
# Extract the first word of "egrep" to use in msg output
@@ -2368,9 +2464,10 @@ do
{ test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
-if "$ac_path_EGREP" --version 2>&1 < /dev/null | grep 'GNU' >/dev/null; then
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:
-else
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
while :
@@ -2390,8 +2487,8 @@ else
# 10*(2^10) chars as input seems more than enough
test $ac_count -gt 10 && break
done
- rm -f conftest.*
-fi
+ rm -f conftest.*;;
+esac
$ac_path_EGREP_found && break 3
@@ -2427,7 +2524,7 @@ echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
if test "${ac_cv_path_FGREP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if echo 'ab*c' | ($GREP -F 'ab*c') >/dev/null 2>&1
+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
then ac_cv_path_FGREP="$GREP -F"
else
# Extract the first word of "fgrep" to use in msg output
@@ -2450,9 +2547,10 @@ do
{ test -f "$ac_path_FGREP" && $as_executable_p "$ac_path_FGREP"; } || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
-if "$ac_path_FGREP" --version 2>&1 < /dev/null | grep 'GNU' >/dev/null; then
- ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:
-else
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
while :
@@ -2472,8 +2570,8 @@ else
# 10*(2^10) chars as input seems more than enough
test $ac_count -gt 10 && break
done
- rm -f conftest.*
-fi
+ rm -f conftest.*;;
+esac
$ac_path_FGREP_found && break 3
@@ -2625,9 +2723,10 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
ac_i=`echo "$ac_i" | sed "$ac_script"`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -2779,9 +2878,8 @@ echo X/"$0" |
as_lineno_1=$LINENO
as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
# uniformly replaced by the line number. The first 'sed' inserts a
@@ -2822,11 +2920,15 @@ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;
}
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+ case `echo 'x\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ *) ECHO_C='\c';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
if expr a : '\(a\)' >/dev/null 2>&1; then
@@ -2963,10 +3065,11 @@ GNU Automake config.status 1.9a
configured by $0, generated by GNU Autoconf 2.59c,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2004 Free Software Foundation, Inc.
+Copyright (C) 2005 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
INSTALL="$INSTALL"
_ACEOF
@@ -2999,8 +3102,8 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ echo "$ac_cs_version"; exit ;;
--he | --h)
# Conflict between --help and --header
{ { echo "$as_me:$LINENO: error: ambiguous option: $1
@@ -3009,8 +3112,8 @@ echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
{ (exit 1); exit 1; }; };;
--help | --hel | -h )
- echo "$ac_cs_usage"; exit 0 ;;
- --debug | --d* | -d )
+ echo "$ac_cs_usage"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
@@ -3311,6 +3414,8 @@ if test "$ac_dir" != .; then
else
ac_dir_suffix= ac_top_builddir=
fi
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
case $srcdir in
.) # No --srcdir option. We are building in place.
@@ -3319,53 +3424,18 @@ case $srcdir in
ac_top_srcdir=.
else
ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
+ fi
+ ac_abs_top_srcdir=$ac_pwd ;;
[\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
*) # Relative name.
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute names, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
+ ac_top_srcdir=$ac_top_builddir$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
case $INSTALL in
@@ -3424,15 +3494,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+s|@configure_input@|$configure_input|;t t
+s|@srcdir@|$ac_srcdir|;t t
+s|@abs_srcdir@|$ac_abs_srcdir|;t t
+s|@top_srcdir@|$ac_top_srcdir|;t t
+s|@abs_top_srcdir@|$ac_abs_top_srcdir|;t t
+s|@builddir@|$ac_builddir|;t t
+s|@abs_builddir@|$ac_abs_builddir|;t t
+s|@top_builddir@|$ac_top_builddir|;t t
+s|@abs_top_builddir@|$ac_abs_top_builddir|;t t
s,@INSTALL@,$ac_INSTALL,;t t
" $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp/out"
rm -f "$tmp/stdin"
diff --git a/configure.ac b/configure.ac
index 2ee14103d..f709fe950 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,8 @@
#
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
dnl Require Autoconf 2.59a for AC_REQUIRE_AUX_FILE.
AC_PREREQ(2.59a)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 18262ee1a..d5d5c901f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,8 +16,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
info_TEXINFOS = automake.texi
automake_TEXINFOS = fdl.texi
diff --git a/doc/fdl.texi b/doc/fdl.texi
index 5385f32cb..fe78df8d5 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -7,7 +7,7 @@
@display
Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -344,7 +344,7 @@ and independent documents or works, in or on a volume of a storage or
distribution medium, is called an ``aggregate'' if the copyright
resulting from the compilation is not used to limit the legal rights
of the compilation's users beyond what the individual works permit.
-When the Document is included an aggregate, this License does not
+When the Document is included in an aggregate, this License does not
apply to the other works in the aggregate which are not themselves
derivative works of the Document.
@@ -366,7 +366,7 @@ permission from their copyright holders, but you may include
translations of some or all Invariant Sections in addition to the
original versions of these Invariant Sections. You may include a
translation of this License, and all the license notices in the
-Document, and any Warrany Disclaimers, provided that you also include
+Document, and any Warranty Disclaimers, provided that you also include
the original English version of this License and the original versions
of those notices and disclaimers. In case of a disagreement between
the translation and the original version of this License or a notice
@@ -420,8 +420,8 @@ license notices just after the title page:
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2
or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
- A copy of the license is included in the section entitled ``GNU
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+ Texts. A copy of the license is included in the section entitled ``GNU
Free Documentation License''.
@end group
@end smallexample
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index 61bc1d568..26d180a68 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::ChannelDefs;
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 0141fd348..7da83b35e 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::Channels;
diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index 34f443efb..19f4a959a 100644
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::Condition;
use strict;
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index b6d23da1a..0df27d0d2 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -13,8 +13,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::Config;
use strict;
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index cb0418876..fb9f018cc 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::Configure_ac;
diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index 7e80e119d..f6c400af4 100644
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::DisjConditions;
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index fec2ff61c..470249cd0 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::FileUtils;
diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm
index 7ea242aac..54f3416f7 100644
--- a/lib/Automake/General.pm
+++ b/lib/Automake/General.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::General;
diff --git a/lib/Automake/Item.pm b/lib/Automake/Item.pm
index 6dc3b24d5..60d6bf415 100644
--- a/lib/Automake/Item.pm
+++ b/lib/Automake/Item.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::Item;
use strict;
diff --git a/lib/Automake/ItemDef.pm b/lib/Automake/ItemDef.pm
index 3d9361dfb..a7f8110da 100644
--- a/lib/Automake/ItemDef.pm
+++ b/lib/Automake/ItemDef.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::ItemDef;
use strict;
diff --git a/lib/Automake/Location.pm b/lib/Automake/Location.pm
index 161d31a8d..fab118dd8 100644
--- a/lib/Automake/Location.pm
+++ b/lib/Automake/Location.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::Location;
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index da2de3da6..20a6e2bf6 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
SUBDIRS = tests
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index b8b5e53f8..9276c95f2 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::Options;
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 8911993c9..f996346f4 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::Rule;
use strict;
diff --git a/lib/Automake/RuleDef.pm b/lib/Automake/RuleDef.pm
index d25c8e749..7c06a2f02 100644
--- a/lib/Automake/RuleDef.pm
+++ b/lib/Automake/RuleDef.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::RuleDef;
use strict;
diff --git a/lib/Automake/Struct.pm b/lib/Automake/Struct.pm
index 85b07e5a4..5abed1a32 100644
--- a/lib/Automake/Struct.pm
+++ b/lib/Automake/Struct.pm
@@ -13,8 +13,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# This file is basically Perl 5.6's Class::Struct, but made compatible
# with Perl 5.5. If someday this has to be updated, be sure to rename
diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm
index 34f7bf806..f69103dbf 100644
--- a/lib/Automake/VarDef.pm
+++ b/lib/Automake/VarDef.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::VarDef;
use strict;
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index c9455ce7c..bd87f254d 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::Variable;
use strict;
diff --git a/lib/Automake/Version.pm b/lib/Automake/Version.pm
index 5a874f817..5c9eaa7a6 100644
--- a/lib/Automake/Version.pm
+++ b/lib/Automake/Version.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::Version;
use strict;
diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index 76957013b..344df873e 100644
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
package Automake::Wrap;
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index dc39ffeb5..c1c58c505 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -12,8 +12,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# Written by Akim Demaille <akim@freefriends.org>.
diff --git a/lib/Automake/tests/Condition.pl b/lib/Automake/tests/Condition.pl
index c2617038e..085ab88aa 100644
--- a/lib/Automake/tests/Condition.pl
+++ b/lib/Automake/tests/Condition.pl
@@ -14,8 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with autoconf; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
use Automake::Condition qw/TRUE FALSE/;
diff --git a/lib/Automake/tests/DisjConditions.pl b/lib/Automake/tests/DisjConditions.pl
index 02ab61c3f..75e8d8547 100644
--- a/lib/Automake/tests/DisjConditions.pl
+++ b/lib/Automake/tests/DisjConditions.pl
@@ -14,8 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with autoconf; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
use Automake::Condition qw/TRUE FALSE/;
use Automake::DisjConditions;
diff --git a/lib/Automake/tests/Makefile.am b/lib/Automake/tests/Makefile.am
index 0ccd955e1..b904ced41 100644
--- a/lib/Automake/tests/Makefile.am
+++ b/lib/Automake/tests/Makefile.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
TESTS_ENVIRONMENT = $(PERL) -Mstrict -I $(top_srcdir)/lib -w
TESTS = \
diff --git a/lib/Automake/tests/Version.pl b/lib/Automake/tests/Version.pl
index f8e2a4084..028d83741 100644
--- a/lib/Automake/tests/Version.pl
+++ b/lib/Automake/tests/Version.pl
@@ -14,8 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
use Automake::Version;
diff --git a/lib/Automake/tests/Wrap.pl b/lib/Automake/tests/Wrap.pl
index c57934364..7ddcdc368 100644
--- a/lib/Automake/tests/Wrap.pl
+++ b/lib/Automake/tests/Wrap.pl
@@ -14,8 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
use Automake::Wrap 'wrap';
diff --git a/lib/COPYING b/lib/COPYING
index d60c31a97..623b6258a 100644
--- a/lib/COPYING
+++ b/lib/COPYING
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
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
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 265b4f063..f9ded1d63 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,8 +16,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
SUBDIRS = Automake am
diff --git a/lib/acinstall b/lib/acinstall
index 4d4f91d32..fa9373db3 100755
--- a/lib/acinstall
+++ b/lib/acinstall
@@ -21,8 +21,8 @@
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
file="$1"
dir="$2"
diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index b17a515e1..52afd4048 100644
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -17,8 +17,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
amdir = $(pkgvdatadir)/am
diff --git a/lib/am/ansi2knr.am b/lib/am/ansi2knr.am
index 7f14daf18..459d35a45 100644
--- a/lib/am/ansi2knr.am
+++ b/lib/am/ansi2knr.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## %ANSI2KNR-DIR% is the directory where ansi2knr is, `' if
## is the current directory.
diff --git a/lib/am/check.am b/lib/am/check.am
index 6c624a990..5865e21f7 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
.PHONY: check-TESTS
diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am
index 870c8e24d..fc909a7b4 100644
--- a/lib/am/clean-hdr.am
+++ b/lib/am/clean-hdr.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
.PHONY: distclean-hdr
distclean-am: distclean-hdr
diff --git a/lib/am/clean.am b/lib/am/clean.am
index 6d650d962..0afc241b1 100644
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## We must test each macro because it might be empty, and an empty "rm
## -rf" command looks disturbing. Also, the Solaris 2.4 "rm" will
diff --git a/lib/am/compile.am b/lib/am/compile.am
index aa1ed576b..8731d7d38 100644
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
DEFAULT_INCLUDES = %DEFAULT_INCLUDES%
diff --git a/lib/am/configure.am b/lib/am/configure.am
index 09f4dab80..e7cea028d 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## This dummy rule is called from subdirectories whenever one of the
diff --git a/lib/am/data.am b/lib/am/data.am
index 45a928c4b..a1a2649bd 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
if %?INSTALL%
include inst-vars.am
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index 652849ffb..501b4082b 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## Name of tool to use. Default is the same as the package.
DEJATOOL = $(PACKAGE)
diff --git a/lib/am/depend.am b/lib/am/depend.am
index f2923490e..a441e8e67 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## This Makefile depends on Depdirs' files, so we should never
## erase them in -am or -recursive rules; that would prevent any other
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 8a26b1959..aca2e1055 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## This file is read several times:
## - once per *extension* (not per language) for generic compilation rules
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index d58a7b710..151f5f0ff 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## DIST_COMMON comes first so that README can be the very first file.
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/lib/am/footer.am b/lib/am/footer.am
index 660a201ca..0a8c09b4d 100644
--- a/lib/am/footer.am
+++ b/lib/am/footer.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
# 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:
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 081eb3e5e..dd3a60dbb 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
diff --git a/lib/am/header.am b/lib/am/header.am
index c0dec3f94..1d4d70c19 100644
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## Exactly the same as data.am.
diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am
index 27666001d..81f00fd91 100644
--- a/lib/am/inst-vars.am
+++ b/lib/am/inst-vars.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
if %?FIRST%
## These variables help stripping any $(VPATH) that some
diff --git a/lib/am/install.am b/lib/am/install.am
index 7864e1af7..b9a8ac1b5 100644
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## ----------------------------------------- ##
## installdirs -- Creating the installdirs. ##
diff --git a/lib/am/java.am b/lib/am/java.am
index 736035c24..12c691f4f 100644
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## ---------- ##
diff --git a/lib/am/lang-compile.am b/lib/am/lang-compile.am
index 1759a24d5..a46a59449 100644
--- a/lib/am/lang-compile.am
+++ b/lib/am/lang-compile.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## This file is read once per *language*, not per extension.
diff --git a/lib/am/lex.am b/lib/am/lex.am
index 645cbe6d1..38f7abb87 100644
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## See the comment about am__skipyacc in yacc.am.
if %?MAINTAINER-MODE%
diff --git a/lib/am/library.am b/lib/am/library.am
index 0fd0e4fc3..39059c353 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
%LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) %DIRSTAMP%
-rm -f %LIBRARY%
$(%XLIBRARY%_AR) %LIBRARY% $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD)
diff --git a/lib/am/libs.am b/lib/am/libs.am
index 63e941de8..402a29716 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
if %?INSTALL%
include inst-vars.am
diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index dd1188816..df97a55f3 100644
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
.PHONY: mostlyclean-libtool clean-libtool distclean-libtool
mostlyclean-am: mostlyclean-libtool
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index dda1f59bd..58b9dae24 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
if %?INSTALL%
include inst-vars.am
diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index 924a88276..9ec33d1ca 100644
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
if %?INSTALL%
include inst-vars.am
diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am
index f04269d7f..33e4915ff 100644
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@ -13,7 +13,7 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
%LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) %DIRSTAMP%
$(%XLINK%) %RPATH% $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS)
diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am
index 6907bd894..5a3ba97a3 100644
--- a/lib/am/mans-vars.am
+++ b/lib/am/mans-vars.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
NROFF = nroff
## We don't really need this, but we use it in case we ever want to
diff --git a/lib/am/mans.am b/lib/am/mans.am
index 08db24e0a..209a39f69 100644
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
man%SECTION%dir = $(mandir)/man%SECTION%
diff --git a/lib/am/multilib.am b/lib/am/multilib.am
index 245f8bf6e..476fb4765 100644
--- a/lib/am/multilib.am
+++ b/lib/am/multilib.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## Multilib support variables.
MULTISRCTOP =
MULTIBUILDTOP =
diff --git a/lib/am/program.am b/lib/am/program.am
index 3039b446a..c0a4f801b 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
%PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) %DIRSTAMP%
## Remove program before linking. Otherwise the link will fail if the
## program is running somewhere. FIXME: this could be a loss if
diff --git a/lib/am/progs.am b/lib/am/progs.am
index ea30757d7..04696cbd9 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## ------------ ##
diff --git a/lib/am/python.am b/lib/am/python.am
index 826dd15fb..07932b188 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -13,8 +13,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
if %?INSTALL%
include inst-vars.am
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index f0ebae6ca..19da18448 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## Explicitly look in srcdir for benefit of non-GNU makes.
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 91a8aa0c6..57356cf30 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
if %?INSTALL%
if ! %?BASE%
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index cfa0a1599..322debb20 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
RECURSIVE_TARGETS += all-recursive check-recursive installcheck-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
diff --git a/lib/am/tags.am b/lib/am/tags.am
index 7afbdd3d8..80237df12 100644
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## ---- ##
## ID. ##
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index b8459e740..829dca1d7 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
DIST_COMMON += %VTEXI% %STAMPVTI%
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index db9ba42d4..cd373e72e 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%:
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 15cb254a2..6882a7846 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -15,8 +15,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## ----------- ##
## Variables. ##
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index 04d45572d..1f0d626db 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -14,8 +14,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
## We want to disable the Yacc rebuild rule when
## 1. AM_MAINTAINER_MODE is used, and
diff --git a/lib/compile b/lib/compile
index ad57e2f68..1b1d23216 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
-scriptversion=2005-02-03.08
+scriptversion=2005-05-14.22
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
@@ -18,7 +18,7 @@ scriptversion=2005-02-03.08
#
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/config-ml.in b/lib/config-ml.in
index d644bd210..efec5a364 100644
--- a/lib/config-ml.in
+++ b/lib/config-ml.in
@@ -16,8 +16,8 @@
#
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/config.guess b/lib/config.guess
index 892833f94..772ec36ab 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -17,7 +17,7 @@ timestamp='2005-02-10'
#
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/config.sub b/lib/config.sub
index d8fd2f8fa..1a7fd8115 100644
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -21,8 +21,8 @@ timestamp='2005-02-10'
#
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/depcomp b/lib/depcomp
index ffcd540c3..88b3a1396 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-02-09.22
+scriptversion=2005-05-14.22
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -17,8 +17,8 @@ scriptversion=2005-02-09.22
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/elisp-comp b/lib/elisp-comp
index 744bd27b6..2d1eb6519 100755
--- a/lib/elisp-comp
+++ b/lib/elisp-comp
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright (C) 1995, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-scriptversion=2005-02-02.22
+scriptversion=2005-05-14.22
# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1995.
#
@@ -17,7 +17,7 @@ scriptversion=2005-02-02.22
#
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/gnupload b/lib/gnupload
index e9060c8f0..d169d0012 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2005-02-02.21
+scriptversion=2005-05-14.22
# Copyright (C) 2004, 2005 Free Software Foundation
#
@@ -17,8 +17,8 @@ scriptversion=2005-02-02.21
#
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# Originally written by Alexandre Duret-Lutz <adl@gnu.org>.
diff --git a/lib/install-sh b/lib/install-sh
index 1a8353401..4d4a9519e 100755
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-02-02.21
+scriptversion=2005-05-14.22
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
diff --git a/lib/mdate-sh b/lib/mdate-sh
index 4b2efdf91..52156b3de 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Get modification time of a file or directory and pretty-print it.
-scriptversion=2005-02-07.09
+scriptversion=2005-05-14.22
# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005 Free Software
# Foundation, Inc.
@@ -19,7 +19,7 @@ scriptversion=2005-02-07.09
#
# 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.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/missing b/lib/missing
index 09edd8844..4228a2046 100755
--- a/lib/missing
+++ b/lib/missing
@@ -1,7 +1,7 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-02-08.22
+scriptversion=2005-05-14.22
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
@@ -19,8 +19,8 @@ scriptversion=2005-02-08.22
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/mkinstalldirs b/lib/mkinstalldirs
index 5d26a485f..7f4333b31 100755
--- a/lib/mkinstalldirs
+++ b/lib/mkinstalldirs
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2005-02-02.21
+scriptversion=2005-05-14.22
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
diff --git a/lib/py-compile b/lib/py-compile
index ca2a05cc4..d6e900b30 100755
--- a/lib/py-compile
+++ b/lib/py-compile
@@ -1,7 +1,7 @@
#!/bin/sh
# py-compile - Compile a Python program
-scriptversion=2005-02-02.22
+scriptversion=2005-05-14.22
# Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -17,8 +17,8 @@ scriptversion=2005-02-02.22
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/symlink-tree b/lib/symlink-tree
index 22132c76a..a9d50831b 100755
--- a/lib/symlink-tree
+++ b/lib/symlink-tree
@@ -15,8 +15,8 @@
#
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index 58bea4dde..e0fbe6358 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -21,8 +21,8 @@
%
% You should have received a copy of the GNU General Public License
% along with this texinfo.tex file; see the file COPYING. If not, write
-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
%
% As a special exception, when this file is read by TeX when processing
% a Texinfo source document, you may use the result without
diff --git a/lib/ylwrap b/lib/ylwrap
index 10e4368b3..102bd893f 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,7 +1,7 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-scriptversion=2005-02-02.22
+scriptversion=2005-05-14.22
# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
@@ -20,7 +20,8 @@ scriptversion=2005-02-02.22
#
# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 105c6380e..3866cf77a 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -17,8 +17,8 @@
## 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.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
m4datadir = $(datadir)/aclocal-$(APIVERSION)
diff --git a/tests/aclibobj.test b/tests/aclibobj.test
index 48ab6640c..f10dccfef 100755
--- a/tests/aclibobj.test
+++ b/tests/aclibobj.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure AC_LIBOBJ and friends work.
diff --git a/tests/acloca10.test b/tests/acloca10.test
index d13c5bbd5..e4ae8f0d8 100755
--- a/tests/acloca10.test
+++ b/tests/acloca10.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure aclocal define macros in the same order as -I's.
# This is the same as aclocal9.test, with the macro calls reversed.
diff --git a/tests/acloca11.test b/tests/acloca11.test
index 5c6167215..ea706659d 100755
--- a/tests/acloca11.test
+++ b/tests/acloca11.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that when two files define the same macro in the same
# directory, the macro from the lexically greatest file is used.
diff --git a/tests/acloca12.test b/tests/acloca12.test
index 3db8104e5..c35e9f9eb 100755
--- a/tests/acloca12.test
+++ b/tests/acloca12.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that when two files define the same macro in the same
# directory, the macro from the lexically greatest file is used.
diff --git a/tests/acloca13.test b/tests/acloca13.test
index eccb3d8bd..e93fd43c1 100755
--- a/tests/acloca13.test
+++ b/tests/acloca13.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure changes to m4_included files also cause aclocal.m4 to change.
diff --git a/tests/acloca14.test b/tests/acloca14.test
index ad48479c0..84f31623b 100755
--- a/tests/acloca14.test
+++ b/tests/acloca14.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure m4_included files are also scanned for definitions.
# Report from Phil Edwards.
diff --git a/tests/acloca15.test b/tests/acloca15.test
index 3a4c8bcb6..000510519 100755
--- a/tests/acloca15.test
+++ b/tests/acloca15.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure aclocal scans configure.in for macro definitions.
# PR/319.
diff --git a/tests/acloca16.test b/tests/acloca16.test
index cc1e04403..a5b65efb8 100755
--- a/tests/acloca16.test
+++ b/tests/acloca16.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure aclocal does not include definitions that are not actually
# evaluated.
diff --git a/tests/acloca17.test b/tests/acloca17.test
index 882b61564..00bef1ab1 100755
--- a/tests/acloca17.test
+++ b/tests/acloca17.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure aclocal report unused required macros.
diff --git a/tests/acloca18.test b/tests/acloca18.test
index f6f732c81..42ee8e6cc 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for --install with #serial numbers.
diff --git a/tests/acloca19.test b/tests/acloca19.test
index 509383f84..319df446e 100755
--- a/tests/acloca19.test
+++ b/tests/acloca19.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure aclocal does not fail on configure.ac inclusions that do
# more than just variable definitions.
diff --git a/tests/aclocal.test b/tests/aclocal.test
index 6a64b3898..d2fa7053e 100755
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that aclocal --output works. Report from
# Alexandre Oliva.
diff --git a/tests/aclocal3.test b/tests/aclocal3.test
index 4c43c3b5e..dbfe8a780 100755
--- a/tests/aclocal3.test
+++ b/tests/aclocal3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure include of include detects missing macros
. ./defs || exit 1
diff --git a/tests/aclocal4.test b/tests/aclocal4.test
index 634a90c00..535ac536c 100755
--- a/tests/aclocal4.test
+++ b/tests/aclocal4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure dependencies on aclocal.m4 are set correctly.
# Report from Jim Meyering.
diff --git a/tests/aclocal5.test b/tests/aclocal5.test
index 72dfffa5f..1bbdc2e35 100755
--- a/tests/aclocal5.test
+++ b/tests/aclocal5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that aclocal.m4's dependencies are honored
# in sub-directories.
diff --git a/tests/aclocal6.test b/tests/aclocal6.test
index f3ee3a92e..90e3a8eb3 100755
--- a/tests/aclocal6.test
+++ b/tests/aclocal6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure aclocal.m4 is rebuilt whenever a configure
# dependency changes. Test for acinclude.m4 and VPATH too.
diff --git a/tests/aclocal7.test b/tests/aclocal7.test
index 350445201..787565cb5 100755
--- a/tests/aclocal7.test
+++ b/tests/aclocal7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure aclocal does not overwrite aclocal.m4 needlessly.
# Also make sure automake --no-force does not overwrite Makefile.in needlessly.
diff --git a/tests/aclocal8.test b/tests/aclocal8.test
index c4675d3eb..9b8cbb987 100755
--- a/tests/aclocal8.test
+++ b/tests/aclocal8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure aclocal does not require unused macros.
diff --git a/tests/aclocal9.test b/tests/aclocal9.test
index 75a1e80f6..3cc3d9f1c 100755
--- a/tests/aclocal9.test
+++ b/tests/aclocal9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure aclocal define macros in the same order as -I's.
diff --git a/tests/acoutbs.test b/tests/acoutbs.test
index 2dc725701..cafec77ba 100755
--- a/tests/acoutbs.test
+++ b/tests/acoutbs.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported by François Pinard.
# If \ is in AC_OUTPUT, automake barfs.
diff --git a/tests/acoutbs2.test b/tests/acoutbs2.test
index 29fc62e07..174a66ccb 100755
--- a/tests/acoutbs2.test
+++ b/tests/acoutbs2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported by David A. Swierczek.
# Another bug with \ in AC_OUTPUT (this time with whitespace).
diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test
index 70db91620..3a0d6e60e 100755
--- a/tests/acoutnoq.test
+++ b/tests/acoutnoq.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported by Jerome Santini.
# If I put this line in my configure.in:
diff --git a/tests/acoutpt.test b/tests/acoutpt.test
index 8734d1642..d663f8eb9 100755
--- a/tests/acoutpt.test
+++ b/tests/acoutpt.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug when AC_OUTPUT has 2 args on the same line, eg:
# AC_OUTPUT([Makefile automake tests/Makefile],[chmod +x automake])
diff --git a/tests/acoutpt2.test b/tests/acoutpt2.test
index 6d1dcaf14..6b21b92ed 100755
--- a/tests/acoutpt2.test
+++ b/tests/acoutpt2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported by Eric Magnien.
diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test
index 2192e4b1f..bd6a43dd8 100755
--- a/tests/acoutqnl.test
+++ b/tests/acoutqnl.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported by François Pinard.
diff --git a/tests/acsilent.test b/tests/acsilent.test
index 6d890d4c0..4a4c7ae84 100755
--- a/tests/acsilent.test
+++ b/tests/acsilent.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure there are no spurious acinclude warnings.
diff --git a/tests/acsubst.test b/tests/acsubst.test
index 063261fdd..e3aa4a30a 100755
--- a/tests/acsubst.test
+++ b/tests/acsubst.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
. ./defs || exit 1
diff --git a/tests/acsubst2.test b/tests/acsubst2.test
index a67e77545..24d4b394d 100755
--- a/tests/acsubst2.test
+++ b/tests/acsubst2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
. ./defs || exit 1
diff --git a/tests/all.test b/tests/all.test
index 1b5ecf774..f067c953c 100755
--- a/tests/all.test
+++ b/tests/all.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure all-local and other -local targets work correctly.
diff --git a/tests/alloca.test b/tests/alloca.test
index d2a10d816..de8126f89 100755
--- a/tests/alloca.test
+++ b/tests/alloca.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we complain if @ALLOCA@ is used without being set in configure.in
diff --git a/tests/alloca2.test b/tests/alloca2.test
index d91fed969..7a8b0974d 100755
--- a/tests/alloca2.test
+++ b/tests/alloca2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we complain if @LTALLOCA@ is used without being set in configure.in
diff --git a/tests/alpha.test b/tests/alpha.test
index 578410674..9a07a434a 100755
--- a/tests/alpha.test
+++ b/tests/alpha.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure README-alpha is distributed when appropriate. Report from
# Jim Meyering.
diff --git a/tests/alpha2.test b/tests/alpha2.test
index 55b378149..39ca29e5e 100755
--- a/tests/alpha2.test
+++ b/tests/alpha2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Another check for README-alpha support. This time it is requested
# from configure.in. Report from Akim Demaille.
diff --git a/tests/amassign.test b/tests/amassign.test
index f0097f99e..c47031f6b 100755
--- a/tests/amassign.test
+++ b/tests/amassign.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to see if AM_ name can be assigned to in configure.in.
# Report from Steve Robbins.
diff --git a/tests/ammissing.test b/tests/ammissing.test
index 63311bb14..8c288a400 100755
--- a/tests/ammissing.test
+++ b/tests/ammissing.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to see if aclocal correctly reports missing AM_ macro.
diff --git a/tests/ansi.test b/tests/ansi.test
index 2b42289fc..505bd9478 100755
--- a/tests/ansi.test
+++ b/tests/ansi.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug where ansi2knr.c is not included in distribution.
# From François Pinard.
diff --git a/tests/ansi10.test b/tests/ansi10.test
index 37e0b108d..342df84b3 100755
--- a/tests/ansi10.test
+++ b/tests/ansi10.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure ansi2knr works with $(LIBOBJS).
diff --git a/tests/ansi2.test b/tests/ansi2.test
index ce859aa24..d4e30c3f7 100755
--- a/tests/ansi2.test
+++ b/tests/ansi2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure ansi2knr built at the right time.
diff --git a/tests/ansi3.test b/tests/ansi3.test
index 6b818dbf9..c5889bc5e 100755
--- a/tests/ansi3.test
+++ b/tests/ansi3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Actual test of ansi2knr functionality. Relies on existence
# of working gcc.
diff --git a/tests/ansi3b.test b/tests/ansi3b.test
index 9f8c1b230..3ba870594 100755
--- a/tests/ansi3b.test
+++ b/tests/ansi3b.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Actual test of ansi2knr functionality. Relies on existence
# of working gcc. Same as ansi3.test, but with AUTOMAKE_OPTIONS
diff --git a/tests/ansi4.test b/tests/ansi4.test
index de5dc3cc9..915c795c9 100755
--- a/tests/ansi4.test
+++ b/tests/ansi4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Quoting regression. Test from Thomas Gagne.
diff --git a/tests/ansi5.test b/tests/ansi5.test
index 8e3ed2256..0f45d242b 100755
--- a/tests/ansi5.test
+++ b/tests/ansi5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for ansi2knr in another directory.
diff --git a/tests/ansi6.test b/tests/ansi6.test
index 94571c30a..8420a3967 100755
--- a/tests/ansi6.test
+++ b/tests/ansi6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check ansi2knr on a source file in subdirectory.
# From Kevin Ryde.
diff --git a/tests/ansi7.test b/tests/ansi7.test
index 0a95b3a98..8eaa7e657 100755
--- a/tests/ansi7.test
+++ b/tests/ansi7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check ansi2knr on a source file in subdirectory.
# ansi6.test is the same test without subdir-objects.
diff --git a/tests/ansi8.test b/tests/ansi8.test
index d05119dff..d0dc045d6 100755
--- a/tests/ansi8.test
+++ b/tests/ansi8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that AM_C_PROTOTYPES is required by ansi2knr
diff --git a/tests/ansi9.test b/tests/ansi9.test
index 5740487d1..d9f8bbd82 100755
--- a/tests/ansi9.test
+++ b/tests/ansi9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that subdir sources, and file compiled using per-target flags
# can still be deansified.
diff --git a/tests/ar.test b/tests/ar.test
index 38cd8dbe4..0362b767c 100755
--- a/tests/ar.test
+++ b/tests/ar.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that AR, ARFLAGS, and RANLIB can be substituted from configure.in.
diff --git a/tests/ar2.test b/tests/ar2.test
index 926d265f5..d76e07626 100755
--- a/tests/ar2.test
+++ b/tests/ar2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure AR and ARFLAGS are defined for EXTRA_LIBRARIES.
# Report from Kevin Ryde.
diff --git a/tests/asm.test b/tests/asm.test
index e4a7f8af0..d21abdc47 100755
--- a/tests/asm.test
+++ b/tests/asm.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test of basic assembly functionality
diff --git a/tests/autohdr.test b/tests/autohdr.test
index 8bf381ab5..17826b82d 100755
--- a/tests/autohdr.test
+++ b/tests/autohdr.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
diff --git a/tests/autohdr2.test b/tests/autohdr2.test
index 8bfd00e51..f40f81c8f 100755
--- a/tests/autohdr2.test
+++ b/tests/autohdr2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
diff --git a/tests/autohdr3.test b/tests/autohdr3.test
index fefc95744..85c6129ec 100755
--- a/tests/autohdr3.test
+++ b/tests/autohdr3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check rebuild rules for autoheader.
diff --git a/tests/autohdr4.test b/tests/autohdr4.test
index eb9f72ab4..74435f5da 100755
--- a/tests/autohdr4.test
+++ b/tests/autohdr4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check rebuild rules for AC_CONFIG_HEADERS.
# (This should also work without GNU Make.)
diff --git a/tests/automake.test b/tests/automake.test
index 5b4f01312..0d12892ef 100755
--- a/tests/automake.test
+++ b/tests/automake.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test Automake's command-line options.
. ./defs || exit 1
diff --git a/tests/auxdir.test b/tests/auxdir.test
index 8feaea8bd..5df06a29f 100755
--- a/tests/auxdir.test
+++ b/tests/auxdir.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure AC_CONFIG_AUX_DIR works correctly.
diff --git a/tests/auxdir2.test b/tests/auxdir2.test
index 5e1d766d4..bb1ebe5d4 100755
--- a/tests/auxdir2.test
+++ b/tests/auxdir2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# It should be possible to use a computed auxdir. This might seem
# bizarre, but it is actually used in multilib builds.
diff --git a/tests/auxdir3.test b/tests/auxdir3.test
index f04ec36c3..3b4167d02 100755
--- a/tests/auxdir3.test
+++ b/tests/auxdir3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure we diagnose misplaced AC_CONFIG_AUX_DIR.
diff --git a/tests/auxdir4.test b/tests/auxdir4.test
index 094e597c7..eae8c370b 100755
--- a/tests/auxdir4.test
+++ b/tests/auxdir4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we diagnose dangerous AC_CONFIG_AUX_DIR names.
diff --git a/tests/backsl.test b/tests/backsl.test
index 6edab7be4..3a0f431f2 100755
--- a/tests/backsl.test
+++ b/tests/backsl.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for "\" problems. Bug report from Joerg-Martin Schwarz.
diff --git a/tests/backsl2.test b/tests/backsl2.test
index 8e97f86f3..85d44def3 100755
--- a/tests/backsl2.test
+++ b/tests/backsl2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# We must skip the backslash, not complain about `./\' not existing.
# Reported by Rick Scott <rwscott@omnisig.com>
diff --git a/tests/backsl3.test b/tests/backsl3.test
index 1448d2e68..d418c0b54 100755
--- a/tests/backsl3.test
+++ b/tests/backsl3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we diagnose trailing backslash at the end of a file.
# Report from Akim Demaile <akim@epita.fr>
diff --git a/tests/backsl4.test b/tests/backsl4.test
index 2736f17b6..fba216af6 100755
--- a/tests/backsl4.test
+++ b/tests/backsl4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we diagnose and fix white spaces following backslash.
# Report from Peter Muir.
diff --git a/tests/badline.test b/tests/badline.test
index 2325f3e59..591cb89fe 100755
--- a/tests/badline.test
+++ b/tests/badline.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that line number and file name in error message
# referring to variable is always correct.
diff --git a/tests/badopt.test b/tests/badopt.test
index 9837b3ffa..d384b5616 100755
--- a/tests/badopt.test
+++ b/tests/badopt.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure bad options cause error.
diff --git a/tests/badprog.test b/tests/badprog.test
index 2da75349a..bd8d9783e 100755
--- a/tests/badprog.test
+++ b/tests/badprog.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that programs with bad names are properly
# transformed.
diff --git a/tests/block.test b/tests/block.test
index 508803aca..0ab34c57d 100755
--- a/tests/block.test
+++ b/tests/block.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure block comments are not double-spaced.
# Report from François Pinard.
diff --git a/tests/bsource.test b/tests/bsource.test
index 282ea5789..36eff9703 100755
--- a/tests/bsource.test
+++ b/tests/bsource.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Regression test for install-recursive appearing in a non recursive Makefile.
# Report from Bruno Haible.
diff --git a/tests/canon.test b/tests/canon.test
index 42fc107a5..be62d1028 100755
--- a/tests/canon.test
+++ b/tests/canon.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that name canonicalization error works.
diff --git a/tests/canon2.test b/tests/canon2.test
index 14ad1b223..0c75f2a58 100755
--- a/tests/canon2.test
+++ b/tests/canon2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure name canonicalization happens for texinfo.
diff --git a/tests/canon3.test b/tests/canon3.test
index c3f0c0453..5d3267ae6 100755
--- a/tests/canon3.test
+++ b/tests/canon3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Yet another canonicalization test.
diff --git a/tests/canon4.test b/tests/canon4.test
index 81d61deb3..33c0555a2 100755
--- a/tests/canon4.test
+++ b/tests/canon4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure name canonicalization happens for libraries.
diff --git a/tests/canon5.test b/tests/canon5.test
index 650cde293..61788877c 100755
--- a/tests/canon5.test
+++ b/tests/canon5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that we allow variable names starting in
# non-letters. Whatever that might mean.
diff --git a/tests/ccnoco.test b/tests/ccnoco.test
index cab826782..f7643ec97 100755
--- a/tests/ccnoco.test
+++ b/tests/ccnoco.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure we can compile when the compiler doesn't
# understand `-c -o'.
diff --git a/tests/check.test b/tests/check.test
index e301924b8..ee8e18b97 100755
--- a/tests/check.test
+++ b/tests/check.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test Automake style tests.
diff --git a/tests/check2.test b/tests/check2.test
index 348f66594..9975feec3 100755
--- a/tests/check2.test
+++ b/tests/check2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test Automake style tests.
diff --git a/tests/check3.test b/tests/check3.test
index 9016f0496..afae102fe 100755
--- a/tests/check3.test
+++ b/tests/check3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure `check:' and `install:' honor $(BUILT_SOURCES).
# PR/359.
diff --git a/tests/check4.test b/tests/check4.test
index 9fc65ddeb..191a640fa 100755
--- a/tests/check4.test
+++ b/tests/check4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure `make -k check' processes all directories.
diff --git a/tests/checkall.test b/tests/checkall.test
index 9a719c675..3c2a4703c 100755
--- a/tests/checkall.test
+++ b/tests/checkall.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug where check target doesn't depend on all.
diff --git a/tests/clean.test b/tests/clean.test
index 5aceeb93f..2b9931cc4 100755
--- a/tests/clean.test
+++ b/tests/clean.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure a clean target depends on previous one.
diff --git a/tests/clean2.test b/tests/clean2.test
index 23a54f323..b9ab88e8d 100755
--- a/tests/clean2.test
+++ b/tests/clean2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure distclean works in cygnus mode.
# Report from Daniel Jacobowitz
diff --git a/tests/colneq.test b/tests/colneq.test
index 908fba25c..f515c4965 100755
--- a/tests/colneq.test
+++ b/tests/colneq.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test that := definitions produce warnings, but otherwise work.
diff --git a/tests/colneq2.test b/tests/colneq2.test
index b0d648203..18051a123 100755
--- a/tests/colneq2.test
+++ b/tests/colneq2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test that := in var substitutions works.
diff --git a/tests/colon.test b/tests/colon.test
index b581cebca..1dc4f98f7 100755
--- a/tests/colon.test
+++ b/tests/colon.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported by Nyul Laszlo. When using the ":" syntax in
# AC_OUTPUT, Automake fails to find the correct file.
diff --git a/tests/colon2.test b/tests/colon2.test
index b4ebad633..b831f789e 100755
--- a/tests/colon2.test
+++ b/tests/colon2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure ":" works with files automake generates.
diff --git a/tests/colon3.test b/tests/colon3.test
index 41b2301fb..aabfdadef 100755
--- a/tests/colon3.test
+++ b/tests/colon3.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure ":" works with files automake generates.
# This test is for multiple ":"s.
diff --git a/tests/colon4.test b/tests/colon4.test
index bf246852f..90901f2fc 100755
--- a/tests/colon4.test
+++ b/tests/colon4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure ":" works with files automake generates.
# This test is for multiple ":"s.
diff --git a/tests/colon5.test b/tests/colon5.test
index b39e3dc7a..97d6b78b2 100755
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Another multi-":" test, this time from Doug Evans.
diff --git a/tests/colon6.test b/tests/colon6.test
index 1d0cd4c42..2c1dc26e1 100755
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Yet another multi-":" test, this time from Ken Pizzini.
diff --git a/tests/colon7.test b/tests/colon7.test
index 666ce8603..24e055868 100755
--- a/tests/colon7.test
+++ b/tests/colon7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Another test for a failing ":" in AC_OUTPUT. Report from Maciej
# Stachowiak.
diff --git a/tests/comment.test b/tests/comment.test
index 531070839..450ceed29 100755
--- a/tests/comment.test
+++ b/tests/comment.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that `#' as start of word in AUTOMAKE_OPTIONS means
# comment.
diff --git a/tests/comment2.test b/tests/comment2.test
index 3b1c4b949..892f67277 100755
--- a/tests/comment2.test
+++ b/tests/comment2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure comment recognition works in PROGRAMS. Report from Mark
# Galassi.
diff --git a/tests/comment3.test b/tests/comment3.test
index fd36e1636..899a76c86 100755
--- a/tests/comment3.test
+++ b/tests/comment3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that `#' after a tab is a failure.
# The Tru64 Unix V5.1 system make will pass these to the
diff --git a/tests/comment4.test b/tests/comment4.test
index 36debf96f..233e4dfd0 100755
--- a/tests/comment4.test
+++ b/tests/comment4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure commented variables are output near their comments.
diff --git a/tests/comment5.test b/tests/comment5.test
index f4d523e8e..bcd650105 100755
--- a/tests/comment5.test
+++ b/tests/comment5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR/280.
# (Automake should complain about trailing backslashes in comments.)
diff --git a/tests/comment6.test b/tests/comment6.test
index 5f1e71a77..0997a4157 100755
--- a/tests/comment6.test
+++ b/tests/comment6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR/322.
diff --git a/tests/comment7.test b/tests/comment7.test
index 6786bc699..0254b8811 100755
--- a/tests/comment7.test
+++ b/tests/comment7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure comment for conditional variables are output near the
# corresponding conditional definitions.
diff --git a/tests/comment8.test b/tests/comment8.test
index f3c1b1ee7..8f84954c5 100755
--- a/tests/comment8.test
+++ b/tests/comment8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure += does not append to a comment.
# Report from Stepan Kasal.
diff --git a/tests/comment9.test b/tests/comment9.test
index 813d36afd..8b4eb7eed 100755
--- a/tests/comment9.test
+++ b/tests/comment9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure ##-comments are ignored in variable definitions.
# Report from Julien Sopena.
diff --git a/tests/compile.test b/tests/compile.test
index f9851d484..1c1bb0c64 100755
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure `compile' preserves spaces in its arguments.
diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test
index 20809ad22..86d585329 100755
--- a/tests/compile_f90_c_cxx.test
+++ b/tests/compile_f90_c_cxx.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure rules to invoke all compilers are selected with
# mixed source objects.
diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test
index a1a3507e3..42eb7ec5b 100755
--- a/tests/compile_f_c_cxx.test
+++ b/tests/compile_f_c_cxx.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure rules to invoke all compilers are selected with
# mixed source objects.
diff --git a/tests/cond.test b/tests/cond.test
index e5ec617a4..583fc024d 100755
--- a/tests/cond.test
+++ b/tests/cond.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check basic use of conditionals.
diff --git a/tests/cond10.test b/tests/cond10.test
index 9b2bb02cb..8694bf1e5 100755
--- a/tests/cond10.test
+++ b/tests/cond10.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in conditionals. From Raja R Harinath.
diff --git a/tests/cond11.test b/tests/cond11.test
index ef4079c2c..f65a393f4 100755
--- a/tests/cond11.test
+++ b/tests/cond11.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in conditionals. From Richard Boulton.
# This checks that, if LDADD is set from a conditional variable
diff --git a/tests/cond13.test b/tests/cond13.test
index 902e427be..4cb301dbc 100755
--- a/tests/cond13.test
+++ b/tests/cond13.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in conditionals.
# Report from Lars J. Aas.
diff --git a/tests/cond14.test b/tests/cond14.test
index b1e9ba75c..161e39fca 100755
--- a/tests/cond14.test
+++ b/tests/cond14.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in conditionals.
# Report from Robert Boehne
diff --git a/tests/cond15.test b/tests/cond15.test
index ed4c23c0e..94354dd99 100755
--- a/tests/cond15.test
+++ b/tests/cond15.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Regression test for conditionally defined overriding of automatic rules.
diff --git a/tests/cond16.test b/tests/cond16.test
index c5f7ee8b8..8322ea3e4 100755
--- a/tests/cond16.test
+++ b/tests/cond16.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in conditionals in SOURCES with variable substitution references.
# Report from Richard Boulton
diff --git a/tests/cond17.test b/tests/cond17.test
index 2fc71a9fc..0ba7c3599 100755
--- a/tests/cond17.test
+++ b/tests/cond17.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for being able to define an object to be generated in different ways
# according to a conditional.
diff --git a/tests/cond18.test b/tests/cond18.test
index d77da6e9b..ad4b60548 100755
--- a/tests/cond18.test
+++ b/tests/cond18.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Regression test for substitution references to conditional variables.
# Report from Richard Boulton
diff --git a/tests/cond19.test b/tests/cond19.test
index 4819ce50f..2a0cab3ca 100755
--- a/tests/cond19.test
+++ b/tests/cond19.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Regression test for substitution references to conditional variables.
# Report from Richard Boulton
diff --git a/tests/cond2.test b/tests/cond2.test
index a08213605..8c7c871dd 100755
--- a/tests/cond2.test
+++ b/tests/cond2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check SUBDIRS set based on conditionals.
diff --git a/tests/cond20.test b/tests/cond20.test
index 7d3ec0636..0e4453de1 100755
--- a/tests/cond20.test
+++ b/tests/cond20.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Regression test for recursion handling in substitution references to
# conditional variables.
diff --git a/tests/cond21.test b/tests/cond21.test
index 7a3c972e3..c6fbd20ec 100755
--- a/tests/cond21.test
+++ b/tests/cond21.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check for use of = and += in different conditions.
diff --git a/tests/cond22.test b/tests/cond22.test
index 25369a62b..8167ad83f 100755
--- a/tests/cond22.test
+++ b/tests/cond22.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Regression test for bug when sources listed in conditional.
# Report from Richard Boulton. PR/326.
diff --git a/tests/cond23.test b/tests/cond23.test
index c6fe42dce..948278b5a 100755
--- a/tests/cond23.test
+++ b/tests/cond23.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
# Report from Patrik Weiskircher
diff --git a/tests/cond24.test b/tests/cond24.test
index 11b6eb542..986fefb24 100755
--- a/tests/cond24.test
+++ b/tests/cond24.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
# Report from Patrik Weiskircher
diff --git a/tests/cond25.test b/tests/cond25.test
index 1872f8b94..8f698a3f5 100755
--- a/tests/cond25.test
+++ b/tests/cond25.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that conditional primaries can use non-conditional directories.
# From Pavel Roskin.
diff --git a/tests/cond26.test b/tests/cond26.test
index ad32eea83..68e90e166 100755
--- a/tests/cond26.test
+++ b/tests/cond26.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that non-conditional primaries can use conditional directories.
# Reported by Juergen Keil.
diff --git a/tests/cond27.test b/tests/cond27.test
index aa6741e99..f206727e7 100755
--- a/tests/cond27.test
+++ b/tests/cond27.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that non-conditional primaries cannot use directories defined
# in some conditions (but not others).
diff --git a/tests/cond28.test b/tests/cond28.test
index c1dbedf03..e76df722b 100755
--- a/tests/cond28.test
+++ b/tests/cond28.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that conditional primaries can use directories defined
# in the same conditions (but not others).
diff --git a/tests/cond29.test b/tests/cond29.test
index 2b5e69ce7..74567f699 100755
--- a/tests/cond29.test
+++ b/tests/cond29.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that many conditions do not lead to combinatorial explosion.
# (This is related to PR/352.)
diff --git a/tests/cond3.test b/tests/cond3.test
index 80f55cee9..926e59db6 100755
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test sources listed in conditional.
# Report from Rob Savoye <rob@cygnus.com>, and Lars J. Aas.
diff --git a/tests/cond30.test b/tests/cond30.test
index 10ff041c0..028b248c6 100755
--- a/tests/cond30.test
+++ b/tests/cond30.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# For PR/352: make sure we support bin_PROGRAMS being defined conditionally.
diff --git a/tests/cond31.test b/tests/cond31.test
index b7c8dacf1..92728543a 100755
--- a/tests/cond31.test
+++ b/tests/cond31.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we define conditional _DEPENDENCIES correctly.
diff --git a/tests/cond32.test b/tests/cond32.test
index 47051b7b3..ade8d5c7a 100755
--- a/tests/cond32.test
+++ b/tests/cond32.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure the user can override a conditional _DEPENDENCIES.
diff --git a/tests/cond33.test b/tests/cond33.test
index a4d30013f..be4522831 100755
--- a/tests/cond33.test
+++ b/tests/cond33.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check for conditional library with a conditional directory.
# Report from Ralf Corsepius
diff --git a/tests/cond34.test b/tests/cond34.test
index 4f716566d..06f9c3156 100755
--- a/tests/cond34.test
+++ b/tests/cond34.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check for _DEPDENDENCIES definition with conditional _LDADD.
# Report from Elena A. Vengerova
diff --git a/tests/cond35.test b/tests/cond35.test
index 3e9bae6d0..ed6b6be28 100755
--- a/tests/cond35.test
+++ b/tests/cond35.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check rules output for parser defined conditionally.
# Report from Roman Fietze.
diff --git a/tests/cond36.test b/tests/cond36.test
index ac728bf39..b75d27557 100755
--- a/tests/cond36.test
+++ b/tests/cond36.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check rules output for parser defined conditionally.
diff --git a/tests/cond37.test b/tests/cond37.test
index ba3802abc..39f07ede2 100755
--- a/tests/cond37.test
+++ b/tests/cond37.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check conditional local rules.
# Report from Simon Josefsson.
diff --git a/tests/cond4.test b/tests/cond4.test
index 3dc88e418..a39d05203 100755
--- a/tests/cond4.test
+++ b/tests/cond4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Another sources-in-conditional test. Report from Tim Goodwin.
diff --git a/tests/cond5.test b/tests/cond5.test
index 95ce84189..da974751e 100755
--- a/tests/cond5.test
+++ b/tests/cond5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Yet another sources-in-conditional test. Report from Tim Goodwin.
diff --git a/tests/cond6.test b/tests/cond6.test
index d5ebe5a15..68822bf5c 100755
--- a/tests/cond6.test
+++ b/tests/cond6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for an odd conditional bug. Report from Matt Leach.
diff --git a/tests/cond7.test b/tests/cond7.test
index c3dec5d64..04051ed15 100755
--- a/tests/cond7.test
+++ b/tests/cond7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for an odd conditional bug. Report from Pavel Roskin.
diff --git a/tests/cond8.test b/tests/cond8.test
index 09f5c3dbf..17e0393cc 100755
--- a/tests/cond8.test
+++ b/tests/cond8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure _PROGRAMS conditionals can be written in a useful
# way.
diff --git a/tests/cond9.test b/tests/cond9.test
index 97462fe26..8713c269b 100755
--- a/tests/cond9.test
+++ b/tests/cond9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in conditionals. From Raja R Harinath.
diff --git a/tests/condd.test b/tests/condd.test
index 67318df3e..4bc06b10a 100755
--- a/tests/condd.test
+++ b/tests/condd.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in conditionals.
diff --git a/tests/condhook.test b/tests/condhook.test
index 55f1b83bb..9e4cf1416 100755
--- a/tests/condhook.test
+++ b/tests/condhook.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test install when a conditional install-*-hook is not defined.
# Report by Nik A. Melchior (PR/428).
diff --git a/tests/condinc.test b/tests/condinc.test
index 15f905704..060e13396 100755
--- a/tests/condinc.test
+++ b/tests/condinc.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure a conditional include statement is handled properly.
diff --git a/tests/condinc2.test b/tests/condinc2.test
index ae808efd8..e260847f1 100755
--- a/tests/condinc2.test
+++ b/tests/condinc2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Another test of conditional include statements.
diff --git a/tests/condlib.test b/tests/condlib.test
index 77b0e5b2e..79b19d06e 100755
--- a/tests/condlib.test
+++ b/tests/condlib.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug with conditional library.
# From Harlan Stenn
diff --git a/tests/condman.test b/tests/condman.test
index 462953d69..316ff66d2 100755
--- a/tests/condman.test
+++ b/tests/condman.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure conditionals work with man pages.
. ./defs || exit 1
diff --git a/tests/condman2.test b/tests/condman2.test
index 4fab4159d..eba2e1e2d 100755
--- a/tests/condman2.test
+++ b/tests/condman2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure appropriate man install targets generated in all cases.
. ./defs || exit 1
diff --git a/tests/conf2.test b/tests/conf2.test
index a4fbf0504..34f5d311a 100755
--- a/tests/conf2.test
+++ b/tests/conf2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure several config headers are allowed.
diff --git a/tests/confdeps.test b/tests/confdeps.test
index e7c04f05e..8e905c07e 100755
--- a/tests/confdeps.test
+++ b/tests/confdeps.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that config* files are properly regenerated.
diff --git a/tests/conff.test b/tests/conff.test
index 56aa06605..208ccd3b2 100755
--- a/tests/conff.test
+++ b/tests/conff.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure rebuild rules work even when AC_CONFIG_FILES uses colons.
# Report from Alexander Turbov.
diff --git a/tests/conff2.test b/tests/conff2.test
index 8e3e01c2e..5665bc8d7 100755
--- a/tests/conff2.test
+++ b/tests/conff2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure empty calls to AC_CONFIG_FILES or AC_CONFIG_HEADERS are diagnosed.
diff --git a/tests/confh.test b/tests/confh.test
index fc10ad09b..89bb67c4d 100755
--- a/tests/confh.test
+++ b/tests/confh.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure config.h works in a subdir.
# Report from Alexandre Oliva.
diff --git a/tests/confh4.test b/tests/confh4.test
index 86ade41e2..22d9755f8 100755
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 34.
diff --git a/tests/confh5.test b/tests/confh5.test
index d46eaa855..33908ab55 100755
--- a/tests/confh5.test
+++ b/tests/confh5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we do not distribute header sources when they are built.
diff --git a/tests/config.test b/tests/config.test
index 596ccfb7e..215a507ff 100755
--- a/tests/config.test
+++ b/tests/config.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure config.h rule made even if it is in a subdir. The
# idea is that if config.h is in a subdir, and there is no Makefile in
diff --git a/tests/confincl.test b/tests/confincl.test
index ed9cdb3ca..146cb9273 100755
--- a/tests/confincl.test
+++ b/tests/confincl.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# This tests for a bug reported by Gord Matzigkeit.
# If config.h is not used, @CONFIG_INCLUDE_SPEC@ should not appear
diff --git a/tests/conflnk.test b/tests/conflnk.test
index a4731c794..81f3da635 100755
--- a/tests/conflnk.test
+++ b/tests/conflnk.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure links created by AC_CONFIG_LINKS get removed with
# `make distclean'
diff --git a/tests/conflnk2.test b/tests/conflnk2.test
index e981226c4..e876e5ec9 100755
--- a/tests/conflnk2.test
+++ b/tests/conflnk2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that sources for links created by AC_CONFIG_LINKS
# are distributed.
diff --git a/tests/conflnk3.test b/tests/conflnk3.test
index 25329ac33..4fde1ead3 100755
--- a/tests/conflnk3.test
+++ b/tests/conflnk3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that AC_CONFIG_LINKS using a variable source
# is not broken.
diff --git a/tests/confsub.test b/tests/confsub.test
index 95ca1c8d2..1b514b77c 100755
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure config.h can be in subdir.
# Also, make sure config.h is properly rebuilt.
diff --git a/tests/confvar.test b/tests/confvar.test
index 70fa29879..5227d5e17 100755
--- a/tests/confvar.test
+++ b/tests/confvar.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure configure_vars stuff works.
diff --git a/tests/confvar2.test b/tests/confvar2.test
index cbe0c338b..bb46d5b73 100755
--- a/tests/confvar2.test
+++ b/tests/confvar2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported by Jim Meyering.
diff --git a/tests/copy.test b/tests/copy.test
index b31df18c5..292d8a39d 100755
--- a/tests/copy.test
+++ b/tests/copy.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure `-c' works. Report from Andris Pavenis.
diff --git a/tests/ctarget1.test b/tests/ctarget1.test
index 7f4fb5ea5..40a671627 100755
--- a/tests/ctarget1.test
+++ b/tests/ctarget1.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check basic use of conditionals.
diff --git a/tests/cxx.test b/tests/cxx.test
index f8db1ff9a..fb152826e 100755
--- a/tests/cxx.test
+++ b/tests/cxx.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test that `.c++' extension works.
# From Ralf Corsepius.
diff --git a/tests/cxx2.test b/tests/cxx2.test
index 3b020c5cf..416fb9a14 100755
--- a/tests/cxx2.test
+++ b/tests/cxx2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test that Automake suggests using AC_PROG_CXX if C++ sources are used.
diff --git a/tests/cxxansi.test b/tests/cxxansi.test
index 50070f46e..67bc0a841 100755
--- a/tests/cxxansi.test
+++ b/tests/cxxansi.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure ansi2knr doesn't use `$U' for C++.
# Report from Robert Boehne.
diff --git a/tests/cxxcpp.test b/tests/cxxcpp.test
index 46e3645b2..4de1ee4eb 100755
--- a/tests/cxxcpp.test
+++ b/tests/cxxcpp.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure automake sees AC_PROG_CXXCPP. From Garth Corral.
diff --git a/tests/cxxlibobj.test b/tests/cxxlibobj.test
index 019ef21f7..2a44c4a5b 100755
--- a/tests/cxxlibobj.test
+++ b/tests/cxxlibobj.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure LIBOBJS and C++ sources work right.
diff --git a/tests/cxxlink.test b/tests/cxxlink.test
index d6769acb8..0a3a00d27 100755
--- a/tests/cxxlink.test
+++ b/tests/cxxlink.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure C++ linker is used when appropriate.
diff --git a/tests/cxxnoc.test b/tests/cxxnoc.test
index e9dbc78ed..07dab538a 100755
--- a/tests/cxxnoc.test
+++ b/tests/cxxnoc.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure pure C++ sources don't include C-specific code.
diff --git a/tests/cxxo.test b/tests/cxxo.test
index aac59b02f..aa8ef587b 100755
--- a/tests/cxxo.test
+++ b/tests/cxxo.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure C++ files are rewritten to ".o" and not just "o".
. ./defs || exit 1
diff --git a/tests/cygwin32.test b/tests/cygwin32.test
index 4cbd62bba..c5d839532 100755
--- a/tests/cygwin32.test
+++ b/tests/cygwin32.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test basic Cygwin32 functionality.
diff --git a/tests/dash.test b/tests/dash.test
index e8beb8deb..eb0aec0c0 100755
--- a/tests/dash.test
+++ b/tests/dash.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure `-' can be used in path.
# Report from Matthew D. Langston.
diff --git a/tests/defs.in b/tests/defs.in
index e9ae198aa..6f8d5cb47 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -18,8 +18,8 @@
#
# You should have received a copy of the GNU General Public License
# along with autoconf; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Defines for Automake testing environment.
# Tom Tromey <tromey@cygnus.com>
diff --git a/tests/defun.test b/tests/defun.test
index 11fe40c72..3fcb07307 100755
--- a/tests/defun.test
+++ b/tests/defun.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure aclocal picks up on all macro definitions.
diff --git a/tests/defun2.test b/tests/defun2.test
index 567aa6127..a26b4b988 100755
--- a/tests/defun2.test
+++ b/tests/defun2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we don't mistake a macro definition for an invocation.
# From Jim Meyering.
diff --git a/tests/dejagnu.test b/tests/dejagnu.test
index 2ff23050b..981795282 100755
--- a/tests/dejagnu.test
+++ b/tests/dejagnu.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure dejagnu tests and automake-style tests can coexist.
diff --git a/tests/dejagnu2.test b/tests/dejagnu2.test
index 7cca82ce4..1e189add2 100755
--- a/tests/dejagnu2.test
+++ b/tests/dejagnu2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we don't override the user's site.exp rule.
diff --git a/tests/dejagnu3.test b/tests/dejagnu3.test
index 67f314a66..7653ead47 100755
--- a/tests/dejagnu3.test
+++ b/tests/dejagnu3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that the DejaGnu rules work for a simple program and test case.
diff --git a/tests/dejagnu4.test b/tests/dejagnu4.test
index 28f956684..6f06d3d24 100755
--- a/tests/dejagnu4.test
+++ b/tests/dejagnu4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that the DejaGnu rules work for a simple program and test case.
diff --git a/tests/dejagnu5.test b/tests/dejagnu5.test
index 4f8dd5dd0..c06c004a7 100755
--- a/tests/dejagnu5.test
+++ b/tests/dejagnu5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that the DejaGnu rules do look for a testsuite named after
# the package by default.
diff --git a/tests/dejagnu6.test b/tests/dejagnu6.test
index 15851c01f..8cee7dbee 100755
--- a/tests/dejagnu6.test
+++ b/tests/dejagnu6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that "make check" fails, when a DejaGnu test fails.
diff --git a/tests/dejagnu7.test b/tests/dejagnu7.test
index e8445a188..c4899f412 100755
--- a/tests/dejagnu7.test
+++ b/tests/dejagnu7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that "make check" fails, when we invoke DejaGnu tests with --status
# (to detect TCL errors) on a file with TCL errors.
diff --git a/tests/depacl2.test b/tests/depacl2.test
index ddc984bb2..d51fcfe40 100755
--- a/tests/depacl2.test
+++ b/tests/depacl2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure dependencies work when required macro is part of
# autoconf.
diff --git a/tests/depcomp.test b/tests/depcomp.test
index 50e184d58..73c9ad765 100755
--- a/tests/depcomp.test
+++ b/tests/depcomp.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure depcomp is installed and found properly
# when required for multiple directories
diff --git a/tests/depcomp2.test b/tests/depcomp2.test
index 02ad62764..b9106128c 100755
--- a/tests/depcomp2.test
+++ b/tests/depcomp2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that depcomp is not used when it's not installed
# From Pavel Roskin.
diff --git a/tests/depcomp3.test b/tests/depcomp3.test
index 8c6349442..34984f668 100755
--- a/tests/depcomp3.test
+++ b/tests/depcomp3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure dashmstdout generates dependencies.
diff --git a/tests/depcomp4.test b/tests/depcomp4.test
index 5bdb34076..5daf393cf 100755
--- a/tests/depcomp4.test
+++ b/tests/depcomp4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 385: makedepend doesn't work with Libtool.
diff --git a/tests/depcomp5.test b/tests/depcomp5.test
index c9600cfa0..f604caa88 100755
--- a/tests/depcomp5.test
+++ b/tests/depcomp5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check icc's dependency mode.
diff --git a/tests/depdist.test b/tests/depdist.test
index cd6df8df5..33eeabc58 100755
--- a/tests/depdist.test
+++ b/tests/depdist.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure depcomp is found for the distribution.
# From Eric Magnien.
diff --git a/tests/depend.test b/tests/depend.test
index 99e1ccb93..b878701c2 100755
--- a/tests/depend.test
+++ b/tests/depend.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# This tests for a bug reported by Henrik Frystyk Nielsen <frystyk@w3.org>
# In some cases the auto-dependency can get confused and try
diff --git a/tests/depend2.test b/tests/depend2.test
index 2f1fefb9f..540fc2baf 100755
--- a/tests/depend2.test
+++ b/tests/depend2.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure dependency tracking works with
# --disable-dependency-tracking.
diff --git a/tests/depend3.test b/tests/depend3.test
index 5fc6ed51f..578a39703 100755
--- a/tests/depend3.test
+++ b/tests/depend3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test _DEPENDENCIES variable. From Lee Iverson.
diff --git a/tests/depend4.test b/tests/depend4.test
index 6f156f068..5926db8e3 100755
--- a/tests/depend4.test
+++ b/tests/depend4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that dependencies are included when there are many header files.
diff --git a/tests/destdir.test b/tests/destdir.test
index 2915f2170..c201a1ca5 100755
--- a/tests/destdir.test
+++ b/tests/destdir.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that `make distcheck' can find some $(DESTDIR) omissions.
# PR/186.
diff --git a/tests/dirforbid.test b/tests/dirforbid.test
index 9cc404917..24d809baa 100755
--- a/tests/dirforbid.test
+++ b/tests/dirforbid.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# All primaries cannot be used with all directories.
# Automake should flag them as errors.
diff --git a/tests/dirlist.test b/tests/dirlist.test
index 1fb122a15..92fe44b95 100755
--- a/tests/dirlist.test
+++ b/tests/dirlist.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check dirlist support.
# This test relies on m4/dirlist
diff --git a/tests/discover.test b/tests/discover.test
index 8e5f10582..b6b8d9fa0 100755
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure LIBOBJS file cannot be mentioned explicitly.
diff --git a/tests/distcom2.test b/tests/distcom2.test
index 3284c05a7..72c322d2c 100755
--- a/tests/distcom2.test
+++ b/tests/distcom2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that depcomp and compile are added to DIST_COMMON
# From Pavel Roskin.
diff --git a/tests/distcom3.test b/tests/distcom3.test
index 189491c0d..f5f188846 100755
--- a/tests/distcom3.test
+++ b/tests/distcom3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that non-existing common files are distributed
# if they are buildable.
diff --git a/tests/distcom4.test b/tests/distcom4.test
index 975f157d9..04016c763 100755
--- a/tests/distcom4.test
+++ b/tests/distcom4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure config files are distributed, and only once.
# This tries to distribute a file from a subdirectory, without
diff --git a/tests/distcom5.test b/tests/distcom5.test
index 84cde4cee..68077b2a4 100755
--- a/tests/distcom5.test
+++ b/tests/distcom5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure config files are distributed, and only once.
# This tries to distribute a file from a subdirectory, with
diff --git a/tests/distcom6.test b/tests/distcom6.test
index 28266c6c3..a7bc1b50e 100755
--- a/tests/distcom6.test
+++ b/tests/distcom6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that depcomp and compile required in subdirectories
# are added to the top-level DIST_COMMON even with --no-force.
diff --git a/tests/distcom7.test b/tests/distcom7.test
index 58f69e294..c67655ad1 100755
--- a/tests/distcom7.test
+++ b/tests/distcom7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that Automake complains when an auxfile (here depcomp)
# is installed, but the Makefile tht distributes it is not processed.
diff --git a/tests/distdir.test b/tests/distdir.test
index 8e85b4470..111ec0f9f 100755
--- a/tests/distdir.test
+++ b/tests/distdir.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure subdirs in EXTRA_DIST work. Also tests to make
# sure "./" is ignored.
diff --git a/tests/distname.test b/tests/distname.test
index b5ae037fe..8ce56969b 100755
--- a/tests/distname.test
+++ b/tests/distname.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test of names in tar file.
# From Rainer Orth
diff --git a/tests/dollar.test b/tests/dollar.test
index 14d21e89e..35432346e 100755
--- a/tests/dollar.test
+++ b/tests/dollar.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# We should support files with `$' characters in their names.
# Java people need this.
diff --git a/tests/double.test b/tests/double.test
index 477c3e697..32acf6a06 100755
--- a/tests/double.test
+++ b/tests/double.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure listing a program twice is ok.
# Report from Manu Rouat.
diff --git a/tests/dup2.test b/tests/dup2.test
index 3e0e74d65..a1e2dc4eb 100755
--- a/tests/dup2.test
+++ b/tests/dup2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure aclocal only warns about definitions overridden by acinclude.m4.
diff --git a/tests/else.test b/tests/else.test
index 7510eb031..15acc0645 100755
--- a/tests/else.test
+++ b/tests/else.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure line numbers are correct in some error reports.
diff --git a/tests/empty.test b/tests/empty.test
index 899a7ab4c..c33635d2e 100755
--- a/tests/empty.test
+++ b/tests/empty.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug where if the list of installables is empty, invalid sh
# code is generated.
diff --git a/tests/empty2.test b/tests/empty2.test
index 8283922ba..8ebedc39e 100755
--- a/tests/empty2.test
+++ b/tests/empty2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure empty _SOURCES suppresses assumption about default
# name. Report from Pavel Roskin.
diff --git a/tests/empty3.test b/tests/empty3.test
index eeb0c5270..6e975f04f 100755
--- a/tests/empty3.test
+++ b/tests/empty3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# A test for missing _SOURCES variable.
diff --git a/tests/empty4.test b/tests/empty4.test
index a9dc1e701..e74e3516f 100755
--- a/tests/empty4.test
+++ b/tests/empty4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure empty _SOURCES works.
# From Paul Berrevoets.
diff --git a/tests/exdir.test b/tests/exdir.test
index 744163e52..335cea0ae 100755
--- a/tests/exdir.test
+++ b/tests/exdir.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check to make sure new extended directory mechanism works.
diff --git a/tests/exdir2.test b/tests/exdir2.test
index 9a9a7a7ea..0ae479b1a 100755
--- a/tests/exdir2.test
+++ b/tests/exdir2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure undefined directories are invalid.
diff --git a/tests/exeext.test b/tests/exeext.test
index 8a5ba9036..c9fdbf6ef 100755
--- a/tests/exeext.test
+++ b/tests/exeext.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure `.' in an exe name doesn't fool us.
# Report from Robert Collins.
diff --git a/tests/exeext2.test b/tests/exeext2.test
index f216351e1..a35e19686 100755
--- a/tests/exeext2.test
+++ b/tests/exeext2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure no-exeext option works.
diff --git a/tests/exeext3.test b/tests/exeext3.test
index 76df0a5e6..78c3d2182 100755
--- a/tests/exeext3.test
+++ b/tests/exeext3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we can override a program rule.
diff --git a/tests/exeext4.test b/tests/exeext4.test
index 951ada1d8..efe48d3fc 100755
--- a/tests/exeext4.test
+++ b/tests/exeext4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure $(EXEEXT) is not appended to @substitutions@.
diff --git a/tests/exsource.test b/tests/exsource.test
index 44737ec95..f7514af15 100755
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure EXTRA_..._SOURCES actually works.
# Bug report from Henrik Frystyk Nielsen.
diff --git a/tests/ext.test b/tests/ext.test
index 427957564..869cbdde4 100755
--- a/tests/ext.test
+++ b/tests/ext.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure extensions are set correctly for various languages.
diff --git a/tests/ext2.test b/tests/ext2.test
index 049209454..7f2dc13cb 100755
--- a/tests/ext2.test
+++ b/tests/ext2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Regression test for a bug reported by Ladislav Strojil.
# Using different extensions for the same language should not
diff --git a/tests/extra.test b/tests/extra.test
index 25b73ab13..5d448be3b 100755
--- a/tests/extra.test
+++ b/tests/extra.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure EXTRA_ targets are generated. This test used to
# make sure the targets were *not* generated. That is wrong; the
diff --git a/tests/extra2.test b/tests/extra2.test
index a76983d59..311c24c7d 100755
--- a/tests/extra2.test
+++ b/tests/extra2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check to make sure EXTRA_foo_SOURCES not defined unnecessarily.
diff --git a/tests/extra3.test b/tests/extra3.test
index 88e046a9b..df41033d2 100755
--- a/tests/extra3.test
+++ b/tests/extra3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check to make sure EXTRA_DATA not required.
diff --git a/tests/extra4.test b/tests/extra4.test
index a2173e904..4aafff306 100755
--- a/tests/extra4.test
+++ b/tests/extra4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check to make sure EXTRA_DATA can be specified.
diff --git a/tests/extra5.test b/tests/extra5.test
index 2087adee5..6fc31ebf7 100755
--- a/tests/extra5.test
+++ b/tests/extra5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check to make sure EXTRA_DIST can contain a directory from $buildir.
# From Dean Povey.
diff --git a/tests/extra6.test b/tests/extra6.test
index 938279f39..d991eb08b 100755
--- a/tests/extra6.test
+++ b/tests/extra6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check to make sure EXTRA_DIST can contain a directory or
# a subdirectory, in $(builddir) or $(srcdir).
diff --git a/tests/extra7.test b/tests/extra7.test
index bb429294e..0a3d181df 100755
--- a/tests/extra7.test
+++ b/tests/extra7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check to make sure that when distdir is invoked in a VPATH
# configuration and has to distribute directory X, it actually merge
diff --git a/tests/f90only.test b/tests/f90only.test
index 9b59f22a9..4c5b1492a 100755
--- a/tests/f90only.test
+++ b/tests/f90only.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure programs with only Fortran 90 source are handled properly.
# (copied from fonly.test) Mike Nolta <mrnolta@princeton.edu>
diff --git a/tests/flibs.test b/tests/flibs.test
index f8efa821e..a0ad20f46 100755
--- a/tests/flibs.test
+++ b/tests/flibs.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure `AC_F77_LIBRARY_LDFLAGS' works properly.
# Matthew D. Langston <langston@SLAC.Stanford.EDU>
diff --git a/tests/fn99.test b/tests/fn99.test
index ba537fd66..05678ee7a 100755
--- a/tests/fn99.test
+++ b/tests/fn99.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check the filename-length-max=99 option.
diff --git a/tests/fnoc.test b/tests/fnoc.test
index d33a0091c..10033f3dc 100755
--- a/tests/fnoc.test
+++ b/tests/fnoc.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that pure Fortran 77 sources don't include
# C-specific code.
diff --git a/tests/fo.test b/tests/fo.test
index a123d6b18..00dff0cae 100755
--- a/tests/fo.test
+++ b/tests/fo.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Fortran 77 files are rewritten to ".o" and not just "o".
# Matthew D. Langston <langston@SLAC.Stanford.EDU>
diff --git a/tests/fonly.test b/tests/fonly.test
index e4651bbd5..422080542 100755
--- a/tests/fonly.test
+++ b/tests/fonly.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure programs with only Fortran 77 source are handled properly.
# Matthew D. Langston <langston@SLAC.Stanford.EDU>
diff --git a/tests/fortdep.test b/tests/fortdep.test
index 04c1e8cb3..6cd241f3f 100755
--- a/tests/fortdep.test
+++ b/tests/fortdep.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure dependency tracking doesn't interfere with Fortran.
# For PR 75.
diff --git a/tests/fpinst2.test b/tests/fpinst2.test
index 41cc573f4..522d45990 100755
--- a/tests/fpinst2.test
+++ b/tests/fpinst2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure "reversed" order of AC_PROG_INSTALL and
# AC_PROG_INSTALL is not buggy.
diff --git a/tests/fpinstall.test b/tests/fpinstall.test
index 722d977dc..9eac4ea83 100755
--- a/tests/fpinstall.test
+++ b/tests/fpinstall.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported by Thomas Morgan. If both AC_PROG_INSTALL and
# AC_PROG_INSTALL appear in configure.in, bad error results.
diff --git a/tests/gcj.test b/tests/gcj.test
index 6182c868e..7f30316c8 100755
--- a/tests/gcj.test
+++ b/tests/gcj.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test of compiled java.
diff --git a/tests/gcj2.test b/tests/gcj2.test
index 33b43c4f0..0ca04b309 100755
--- a/tests/gcj2.test
+++ b/tests/gcj2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure `..' invalid in subdir .o's.
diff --git a/tests/gcj3.test b/tests/gcj3.test
index b7e2ac48e..c316ea653 100755
--- a/tests/gcj3.test
+++ b/tests/gcj3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure dependency tracking works for java.
diff --git a/tests/gcj4.test b/tests/gcj4.test
index 238faaca8..f6cf60668 100755
--- a/tests/gcj4.test
+++ b/tests/gcj4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure dependency tracking works for Java.
diff --git a/tests/gcj5.test b/tests/gcj5.test
index 87d465b83..73ee3cd98 100755
--- a/tests/gcj5.test
+++ b/tests/gcj5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Automake suggests AM_PROG_GCJ when GCJ is needed.
diff --git a/tests/getopt.test b/tests/getopt.test
index 4fe59a034..c5f5567e8 100755
--- a/tests/getopt.test
+++ b/tests/getopt.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Automake --help, and --version should have priority over any other option
# so that their `exit 0' is coherent.
diff --git a/tests/gettext.test b/tests/gettext.test
index ef9d37f8c..dd58985c9 100755
--- a/tests/gettext.test
+++ b/tests/gettext.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check gettext support.
diff --git a/tests/gettext2.test b/tests/gettext2.test
index b572f768c..bce0b48ca 100755
--- a/tests/gettext2.test
+++ b/tests/gettext2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check gettext `external' support.
# PR/338, reported by Charles Wilson.
diff --git a/tests/gnits.test b/tests/gnits.test
index f5567610c..15cbe9e6d 100755
--- a/tests/gnits.test
+++ b/tests/gnits.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to ensure --gnits version checking is correct.
diff --git a/tests/gnits2.test b/tests/gnits2.test
index 59882015c..64f6745be 100755
--- a/tests/gnits2.test
+++ b/tests/gnits2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to ensure std-options checking is correct.
diff --git a/tests/gnits3.test b/tests/gnits3.test
index 4e3b50f4f..093d7633a 100755
--- a/tests/gnits3.test
+++ b/tests/gnits3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that AM_INSTALLCHECK_STD_OPTIONS_EXEMPT works.
diff --git a/tests/gnumake.test b/tests/gnumake.test
index 41701c86e..b0a5cf59e 100755
--- a/tests/gnumake.test
+++ b/tests/gnumake.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Automake should not assume that make files are called Makefile.
# Report from Braden McDaniel.
diff --git a/tests/gnuwarn.test b/tests/gnuwarn.test
index 492999ef5..dadcdc466 100755
--- a/tests/gnuwarn.test
+++ b/tests/gnuwarn.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that Automake warns about user variables being overridden.
diff --git a/tests/gnuwarn2.test b/tests/gnuwarn2.test
index b380cb78a..8983a8e5b 100755
--- a/tests/gnuwarn2.test
+++ b/tests/gnuwarn2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check diagnostics about no-installman being disallowed in `gnu'.
diff --git a/tests/header.test b/tests/header.test
index 5cea6c73d..a58d922a6 100755
--- a/tests/header.test
+++ b/tests/header.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 68.
diff --git a/tests/help.test b/tests/help.test
index 623a301a1..500166a81 100755
--- a/tests/help.test
+++ b/tests/help.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure --help and --version work, even when no configure.ac
# is in the current directory.
diff --git a/tests/hfs.test b/tests/hfs.test
index 9e3748f1b..81676c764 100755
--- a/tests/hfs.test
+++ b/tests/hfs.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Automake should not think that ChangeLog == CHANGELOG on
diff --git a/tests/hosts.test b/tests/hosts.test
index 46b3ebd20..157962d71 100755
--- a/tests/hosts.test
+++ b/tests/hosts.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure automake correctly recognizes presence of
# AC_CANONICAL_(BUILD|HOST|SYSTEM|TARGET), and creates config.* in all
diff --git a/tests/implicit.test b/tests/implicit.test
index ddd5805aa..be6a7abce 100755
--- a/tests/implicit.test
+++ b/tests/implicit.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure implicit .o's are listed as appropriate. Report
# from Henrik Frystyk Nielsen.
diff --git a/tests/include.test b/tests/include.test
index dc81f3ceb..e550891ed 100755
--- a/tests/include.test
+++ b/tests/include.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure header vars defined only once when including.
# Report from Marcus G. Daniels.
diff --git a/tests/include2.test b/tests/include2.test
index c4343be0a..b6824d416 100755
--- a/tests/include2.test
+++ b/tests/include2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure included files in parent directory are distributed.
diff --git a/tests/info.test b/tests/info.test
index a0bc6d029..dd2f9d9b4 100755
--- a/tests/info.test
+++ b/tests/info.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure info files are distributed correctly.
diff --git a/tests/insh2.test b/tests/insh2.test
index 067c34a0f..41d5d5e07 100755
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug where install-sh not included in distribution.
diff --git a/tests/install2.test b/tests/install2.test
index 056869eb1..11c602316 100755
--- a/tests/install2.test
+++ b/tests/install2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in `make dist'
# From Pavel Roskin.
diff --git a/tests/installdir.test b/tests/installdir.test
index 189983227..0551bc963 100755
--- a/tests/installdir.test
+++ b/tests/installdir.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 203.
diff --git a/tests/instdat.test b/tests/instdat.test
index a52e32b43..a05632d85 100755
--- a/tests/instdat.test
+++ b/tests/instdat.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to see if defining INSTALL_DATA causes problems. From EGCS
# list.
diff --git a/tests/instdat2.test b/tests/instdat2.test
index 8df9f6a47..735e07815 100755
--- a/tests/instdat2.test
+++ b/tests/instdat2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test that installing under $exec_prefix is handled by install-exec.
# Testing with headers for instance.
diff --git a/tests/instexec.test b/tests/instexec.test
index 815fd9dbd..84a2518f9 100755
--- a/tests/instexec.test
+++ b/tests/instexec.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for this bug: when a Makefile.am builds nothing, no
# install-exec target is generated.
diff --git a/tests/insthook.test b/tests/insthook.test
index b924d20e7..b40d65f89 100755
--- a/tests/insthook.test
+++ b/tests/insthook.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure the install-exec-hook example we give in the manual works.
diff --git a/tests/instman.test b/tests/instman.test
index 33cc4944f..a9566f2a8 100755
--- a/tests/instman.test
+++ b/tests/instman.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure mkdir_p invocation correct in install-man
# target. Bug reported by Gordon Irlam <gordoni@cygnus.com>.
diff --git a/tests/instman2.test b/tests/instman2.test
index 202385367..981fb3ba1 100755
--- a/tests/instman2.test
+++ b/tests/instman2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure mkinstalldirs invocation correct in install-man
# target. Bug reported by Gordon Irlam <gordoni@cygnus.com>.
diff --git a/tests/instsh.test b/tests/instsh.test
index 0cd9cb296..a76872454 100755
--- a/tests/instsh.test
+++ b/tests/instsh.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for this bug:
# automake: Makefile.am: required file "../../install-sh" not found; installing
diff --git a/tests/instsh2.test b/tests/instsh2.test
index cc96c1bda..8e463db66 100755
--- a/tests/instsh2.test
+++ b/tests/instsh2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Various install-sh checks
diff --git a/tests/instspc.test b/tests/instspc.test
index a0e315b84..fb832301e 100755
--- a/tests/instspc.test
+++ b/tests/instspc.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that installation to directory with spaces succeed.
# Report from James Amundson.
diff --git a/tests/interp.test b/tests/interp.test
index 1088fca22..a1fe11e6c 100755
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure variable interpolation works.
diff --git a/tests/interp2.test b/tests/interp2.test
index ca9e09e7a..86e91f30c 100755
--- a/tests/interp2.test
+++ b/tests/interp2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure variable interpolation doesn't break other
# features. Report from Joel N. Weber, II.
diff --git a/tests/java.test b/tests/java.test
index e5e91f9c9..e9f53635a 100755
--- a/tests/java.test
+++ b/tests/java.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Minimal test of Java functionality.
diff --git a/tests/java2.test b/tests/java2.test
index f9e46e879..73a756a35 100755
--- a/tests/java2.test
+++ b/tests/java2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that Java rules doesn't attempt to run javac when there is
# no classes to compile.
diff --git a/tests/java3.test b/tests/java3.test
index d4c13d158..393d699a2 100755
--- a/tests/java3.test
+++ b/tests/java3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that Java rules don't attempt to install *.java files when
# there are none.
diff --git a/tests/javaprim.test b/tests/javaprim.test
index 243e6db9a..001de22fc 100755
--- a/tests/javaprim.test
+++ b/tests/javaprim.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure JAVA variable can be defined.
diff --git a/tests/javasubst.test b/tests/javasubst.test
index 3b128b7cd..87cafcdbd 100755
--- a/tests/javasubst.test
+++ b/tests/javasubst.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure redefining JAVAC works.
diff --git a/tests/ldadd.test b/tests/ldadd.test
index 83f13a360..c59ff7143 100755
--- a/tests/ldadd.test
+++ b/tests/ldadd.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check to make sure incorrect LDADD usage is diagnosed.
diff --git a/tests/ldflags.test b/tests/ldflags.test
index aec0bb327..1c805c869 100755
--- a/tests/ldflags.test
+++ b/tests/ldflags.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check for LDFLAGS in conditional.
# PR 77.
diff --git a/tests/lex.test b/tests/lex.test
index 8fde2502c..118b755bc 100755
--- a/tests/lex.test
+++ b/tests/lex.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
. ./defs || exit 1
diff --git a/tests/lex2.test b/tests/lex2.test
index d715b3387..2322c72b2 100755
--- a/tests/lex2.test
+++ b/tests/lex2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that Automake suggest using AM_PROG_LEX when a lexer is used.
diff --git a/tests/lex3.test b/tests/lex3.test
index 77e0bd1a1..5821b84de 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test associated with PR 19.
# From Matthew D. Langston.
diff --git a/tests/lex4.test b/tests/lex4.test
index 447a4a9d9..45a6744f2 100755
--- a/tests/lex4.test
+++ b/tests/lex4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure dependencies work with .ll files.
# Test synthesized from PR automake/6.
diff --git a/tests/lex5.test b/tests/lex5.test
index 71554cddc..1883a0103 100755
--- a/tests/lex5.test
+++ b/tests/lex5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for subdir lexers.
diff --git a/tests/libobj10.test b/tests/libobj10.test
index dbf55c6ad..06addb73f 100755
--- a/tests/libobj10.test
+++ b/tests/libobj10.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Do not complain about the nonexistence of a source for LIBOBJS if
# it's in BUILT_SOURCES. Reported by Erez Zadok.
diff --git a/tests/libobj11.test b/tests/libobj11.test
index db2b7656c..14d41858d 100755
--- a/tests/libobj11.test
+++ b/tests/libobj11.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# AC_LIBOBJ must allow [] around its argument.
diff --git a/tests/libobj12.test b/tests/libobj12.test
index c3de96dd9..398a705df 100755
--- a/tests/libobj12.test
+++ b/tests/libobj12.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test if a file can be mentioned in LIBOBJS and explicitly.
diff --git a/tests/libobj13.test b/tests/libobj13.test
index 70b9c845a..e992f6978 100755
--- a/tests/libobj13.test
+++ b/tests/libobj13.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test if a file can be mentioned in LTLIBOBJS and explicitly.
diff --git a/tests/libobj14.test b/tests/libobj14.test
index 8e0c11e45..9cce6b1ad 100755
--- a/tests/libobj14.test
+++ b/tests/libobj14.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Regression test for an internal error when @LIBOBJS@ is used in
# a variable that is not defined in the same conditions as the _LDADD
diff --git a/tests/libobj2.test b/tests/libobj2.test
index 07a7bc154..6e22b58df 100755
--- a/tests/libobj2.test
+++ b/tests/libobj2.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure LIBOBJS works in subdirs.
# Bug from Josh MacDonald.
diff --git a/tests/libobj3.test b/tests/libobj3.test
index 58c24af8f..7c187254b 100755
--- a/tests/libobj3.test
+++ b/tests/libobj3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we complain if @LIBOBJS@ is used without being set in configure.in
diff --git a/tests/libobj4.test b/tests/libobj4.test
index 7814d6fd2..1c6901e53 100755
--- a/tests/libobj4.test
+++ b/tests/libobj4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure LIBOBJS error only occurs if LIBOBJS seen. Report
# from Jim Meyering.
diff --git a/tests/libobj5.test b/tests/libobj5.test
index d694a7245..f7523f726 100755
--- a/tests/libobj5.test
+++ b/tests/libobj5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure AC_REPLACE_FUNCS works across lines. Report from
# Jim Meyering.
diff --git a/tests/libobj7.test b/tests/libobj7.test
index 29611b8e2..f201731d7 100755
--- a/tests/libobj7.test
+++ b/tests/libobj7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for multiple replacement functions.
diff --git a/tests/libobj8.test b/tests/libobj8.test
index 834db163f..4a97fa672 100755
--- a/tests/libobj8.test
+++ b/tests/libobj8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure `_.c' dependencies are generated for LIBOBJS
# objects.
diff --git a/tests/library.test b/tests/library.test
index 36eb532d1..03a12e2a5 100755
--- a/tests/library.test
+++ b/tests/library.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for _DEPENDENCIES with libraries.
diff --git a/tests/library2.test b/tests/library2.test
index 316d17463..42ddf3d6f 100755
--- a/tests/library2.test
+++ b/tests/library2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Automake suggest using AC_PROG_RANLIB when *_LIBRARIES is used.
diff --git a/tests/library3.test b/tests/library3.test
index bbfb7e7b9..8806e6f59 100755
--- a/tests/library3.test
+++ b/tests/library3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Automake simplify conditions in diagnostics.
diff --git a/tests/libtool.test b/tests/libtool.test
index 57e93ab77..a7ca883d9 100755
--- a/tests/libtool.test
+++ b/tests/libtool.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure libtool is removed.
# Report from Kevin Dalley
diff --git a/tests/libtool2.test b/tests/libtool2.test
index 492b7ebfd..730469591 100755
--- a/tests/libtool2.test
+++ b/tests/libtool2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure libtool clean targets exist.
# Report from Eric Magnien.
diff --git a/tests/libtool3.test b/tests/libtool3.test
index 10940e863..c8c7f789e 100755
--- a/tests/libtool3.test
+++ b/tests/libtool3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Try to build and package a program linked to a Libtool library.
# Also make sure we do not bloat the Makefile with unneeded rules.
diff --git a/tests/libtool4.test b/tests/libtool4.test
index ed3c430f3..6cd4d4e96 100755
--- a/tests/libtool4.test
+++ b/tests/libtool4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Automake suggests AC_PROG_LIBTOOL when *_LTLIBRARIES is used.
diff --git a/tests/libtool5.test b/tests/libtool5.test
index 159954188..eb5712bd7 100755
--- a/tests/libtool5.test
+++ b/tests/libtool5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure it's ok to install a library under different conditions
# in the same directory.
diff --git a/tests/libtool6.test b/tests/libtool6.test
index bc190a944..67ae43c21 100755
--- a/tests/libtool6.test
+++ b/tests/libtool6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure it's OK to install a library under different conditions
# in different directories. PR/285.
diff --git a/tests/libtool7.test b/tests/libtool7.test
index 5cf8efee6..d571a851d 100755
--- a/tests/libtool7.test
+++ b/tests/libtool7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we allow Libtool's -dlopen/-dlpreopen
# Also check basic support for AM_LIBTOOLFLAGS/LIBTOOLFLAGS
diff --git a/tests/libtool8.test b/tests/libtool8.test
index 67d80c639..29e937446 100755
--- a/tests/libtool8.test
+++ b/tests/libtool8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Automake diagnoses conflicting installations.
diff --git a/tests/libtool9.test b/tests/libtool9.test
index 5b2101ed2..740b17c90 100755
--- a/tests/libtool9.test
+++ b/tests/libtool9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure xxx_LINK is defined for each target that requires specific
# flags.
diff --git a/tests/license.test b/tests/license.test
index 851026b44..e2a967fd8 100755
--- a/tests/license.test
+++ b/tests/license.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure COPYING is not overwritten, even with -a -f.
diff --git a/tests/link_c_cxx.test b/tests/link_c_cxx.test
index f42f747ca..305548472 100755
--- a/tests/link_c_cxx.test
+++ b/tests/link_c_cxx.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure the C++ linker is used when appropriate.
# Matthew D. Langston <langston@SLAC.Stanford.EDU>
diff --git a/tests/link_dist.test b/tests/link_dist.test
index 202f8631b..2dcaecb09 100755
--- a/tests/link_dist.test
+++ b/tests/link_dist.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure the linker for a dist_*_SOURCES can override that for
# *_SOURCES
diff --git a/tests/link_f90_only.test b/tests/link_f90_only.test
index 8d27835fb..3d8a3c459 100755
--- a/tests/link_f90_only.test
+++ b/tests/link_f90_only.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure the Fortran 90 linker is used when appropriate.
# (copied from link_f_only.test) Mike Nolta <mrnolta@princeton.edu>
diff --git a/tests/link_f_only.test b/tests/link_f_only.test
index f067c873a..20cc59459 100755
--- a/tests/link_f_only.test
+++ b/tests/link_f_only.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure the Fortran 77 linker is used when appropriate.
# Matthew D. Langston <langston@SLAC.Stanford.EDU>
diff --git a/tests/link_fc.test b/tests/link_fc.test
index 5c16e58e2..7791ade7f 100755
--- a/tests/link_fc.test
+++ b/tests/link_fc.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure the Fortran 77 linker is used when appropriate.
# Matthew D. Langston <langston@SLAC.Stanford.EDU>
diff --git a/tests/link_fccxx.test b/tests/link_fccxx.test
index ae47a452d..a7fde4cd4 100755
--- a/tests/link_fccxx.test
+++ b/tests/link_fccxx.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure the C++ linker is used when appropriate.
# Matthew D. Langston <langston@SLAC.Stanford.EDU>
diff --git a/tests/link_fcxx.test b/tests/link_fcxx.test
index 7fbd672a8..3ab6f00ad 100755
--- a/tests/link_fcxx.test
+++ b/tests/link_fcxx.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure the C++ linker is used when appropriate.
# Matthew D. Langston <langston@SLAC.Stanford.EDU>
diff --git a/tests/lisp2.test b/tests/lisp2.test
index b733cad53..99e04ccbb 100755
--- a/tests/lisp2.test
+++ b/tests/lisp2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that Automake suggest using AM_PATH_LISPDIR to define lispdir.
diff --git a/tests/lisp3.test b/tests/lisp3.test
index 0197e593d..7db88902a 100755
--- a/tests/lisp3.test
+++ b/tests/lisp3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test that compiling interdependent elisp files works.
diff --git a/tests/lisp4.test b/tests/lisp4.test
index dc950b3d6..bbbeb3f45 100755
--- a/tests/lisp4.test
+++ b/tests/lisp4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure setting ELCFILES= disable byte-compilation as documented.
# Report from Simon Josefsson.
diff --git a/tests/lisp5.test b/tests/lisp5.test
index edecbcc94..4a01a17cb 100755
--- a/tests/lisp5.test
+++ b/tests/lisp5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Same as lisp4.test, but using the now-recommanded way to install
# non-bytecompiled *.el files.
diff --git a/tests/lisp6.test b/tests/lisp6.test
index 724c05205..2fe76fabe 100755
--- a/tests/lisp6.test
+++ b/tests/lisp6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for conditional _LISP.
diff --git a/tests/lisp7.test b/tests/lisp7.test
index ff6722673..1bc10c219 100755
--- a/tests/lisp7.test
+++ b/tests/lisp7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that lisp_LISP also works when emacs is not installed.
diff --git a/tests/lisp8.test b/tests/lisp8.test
index 650cdda1c..3d1e2cac4 100755
--- a/tests/lisp8.test
+++ b/tests/lisp8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check the recover rule of lisp_LISP with parallel make.
diff --git a/tests/listval.test b/tests/listval.test
index 174a87c83..46a3c455d 100755
--- a/tests/listval.test
+++ b/tests/listval.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure variable is expanded properly.
# From Adam J. Richter.
diff --git a/tests/location.test b/tests/location.test
index 8c098ea2e..4576307c6 100755
--- a/tests/location.test
+++ b/tests/location.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for locations in error messages.
diff --git a/tests/longlin2.test b/tests/longlin2.test
index ec1eee24e..7d461bee0 100755
--- a/tests/longlin2.test
+++ b/tests/longlin2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Long lines should be wrapped.
# Report from Albert Chin.
diff --git a/tests/longline.test b/tests/longline.test
index dc435fb82..3c634f8a0 100755
--- a/tests/longline.test
+++ b/tests/longline.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Long lines of += should be wrapped.
# Report from Simon Josefsson.
diff --git a/tests/ltcond.test b/tests/ltcond.test
index 2f69838be..6b413c727 100755
--- a/tests/ltcond.test
+++ b/tests/ltcond.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for conditional libtool libraries.
# This combines two examples from the manual.
diff --git a/tests/ltcond2.test b/tests/ltcond2.test
index f35e21c9a..d6915d103 100755
--- a/tests/ltcond2.test
+++ b/tests/ltcond2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in conditionals.
diff --git a/tests/ltconv.test b/tests/ltconv.test
index 269514b6c..9825b678f 100755
--- a/tests/ltconv.test
+++ b/tests/ltconv.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for libtool convenience libraries.
# This example is taken from the manual.
diff --git a/tests/ltdeps.test b/tests/ltdeps.test
index 919a23ca0..6c8474b62 100755
--- a/tests/ltdeps.test
+++ b/tests/ltdeps.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure libtool library dependencies are correct.
# Report from Lars J. Aas.
diff --git a/tests/ltlibobjs.test b/tests/ltlibobjs.test
index 2c3468d32..565cf70b0 100755
--- a/tests/ltlibobjs.test
+++ b/tests/ltlibobjs.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure LTLIBOBJS alone works ok.
# Report from Vadim Zeitlin.
diff --git a/tests/ltlibsrc.test b/tests/ltlibsrc.test
index dd7d33f70..ff33d43ce 100755
--- a/tests/ltlibsrc.test
+++ b/tests/ltlibsrc.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure a sensible default source for libraries is used.
diff --git a/tests/maintclean.test b/tests/maintclean.test
index 87ebc0df3..b54ecf9a5 100755
--- a/tests/maintclean.test
+++ b/tests/maintclean.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure distclean and maintainer-clean erase the right files.
diff --git a/tests/make.test b/tests/make.test
index 22a1d4a9b..de99d903a 100755
--- a/tests/make.test
+++ b/tests/make.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure `make' check works.
# From Ralf Corsepius.
diff --git a/tests/makej.test b/tests/makej.test
index 90982185f..1b24e23f9 100755
--- a/tests/makej.test
+++ b/tests/makej.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# `make -j' used to fail with Autoconf < 2.58, because tools like
# autoconf and automake can try to update autom4te's cache in parallel.
diff --git a/tests/makevars.test b/tests/makevars.test
index 6a020a6cc..1a5f0df6e 100755
--- a/tests/makevars.test
+++ b/tests/makevars.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that automake includes the needed variables,
# but not too many.
diff --git a/tests/man.test b/tests/man.test
index b8f5126a0..f4e33445d 100755
--- a/tests/man.test
+++ b/tests/man.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure `dist' prefix works with man pages.
diff --git a/tests/man2.test b/tests/man2.test
index 87aedec4a..d34c5de73 100755
--- a/tests/man2.test
+++ b/tests/man2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that man pages listed in man_MANS are installed and
# renamed as documented.
diff --git a/tests/mclean.test b/tests/mclean.test
index b2477e370..8d9baeacf 100755
--- a/tests/mclean.test
+++ b/tests/mclean.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure MAINTAINERCLEANFILES works.
# Report from Paul D. Smith.
diff --git a/tests/mdate.test b/tests/mdate.test
index 3a6d1789e..fbcbebbca 100755
--- a/tests/mdate.test
+++ b/tests/mdate.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test that mdate-sh is required when Texinfo used and version.texi needed.
diff --git a/tests/mdate2.test b/tests/mdate2.test
index fc81962c0..6bb584019 100755
--- a/tests/mdate2.test
+++ b/tests/mdate2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure mdate-sh is included in distribution.
diff --git a/tests/mdate3.test b/tests/mdate3.test
index 900ef5f21..0ac38209b 100755
--- a/tests/mdate3.test
+++ b/tests/mdate3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure mdate-sh run correctly.
diff --git a/tests/mdate4.test b/tests/mdate4.test
index 42eda67a5..2c86dc9c0 100755
--- a/tests/mdate4.test
+++ b/tests/mdate4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that mdate-sh is added to the right directory.
# Report from Kevin Dalley
diff --git a/tests/missing.test b/tests/missing.test
index 5e6e58321..c7d369648 100755
--- a/tests/missing.test
+++ b/tests/missing.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test missing with version mismatches.
diff --git a/tests/missing2.test b/tests/missing2.test
index 79d877a7c..df4ba558a 100755
--- a/tests/missing2.test
+++ b/tests/missing2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test missing with version mismatches.
diff --git a/tests/missing3.test b/tests/missing3.test
index 25971657c..bc2d2993e 100755
--- a/tests/missing3.test
+++ b/tests/missing3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test missing when running a tool's --version.
diff --git a/tests/mkinst2.test b/tests/mkinst2.test
index 196440e67..a6a70fdae 100755
--- a/tests/mkinst2.test
+++ b/tests/mkinst2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure no-installman suppresses man dir creation.
diff --git a/tests/mkinstall.test b/tests/mkinstall.test
index e88a9e531..b63fabb90 100755
--- a/tests/mkinstall.test
+++ b/tests/mkinstall.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug where mkinstalldirs variable can be set incorrectly.
diff --git a/tests/mmodely.test b/tests/mmodely.test
index d687da5e8..fe8d96fa8 100755
--- a/tests/mmodely.test
+++ b/tests/mmodely.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Verify that intermediate files are only built from Yacc and Lex
# sources in maintainer mode.
diff --git a/tests/multlib.test b/tests/multlib.test
index c64bce0f2..f4c4b57a4 100755
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check multilib support.
# Based on a test case from Ralf Corsepius.
diff --git a/tests/nobase.test b/tests/nobase.test
index d8b8e7927..867660799 100755
--- a/tests/nobase.test
+++ b/tests/nobase.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure nobase_* works.
diff --git a/tests/nodef.test b/tests/nodef.test
index 2b9210a12..52ecdef85 100755
--- a/tests/nodef.test
+++ b/tests/nodef.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that PACKAGE and VERSION are AC_DEFINEd when requested.
diff --git a/tests/nodef2.test b/tests/nodef2.test
index ebc2fd778..c4dacf1d9 100755
--- a/tests/nodef2.test
+++ b/tests/nodef2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that PACKAGE and VERSION are AC_DEFINEd when requested.
diff --git a/tests/nodep.test b/tests/nodep.test
index 211ed2b8f..9444b085f 100755
--- a/tests/nodep.test
+++ b/tests/nodep.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure no-dependencies option does the right thing.
# Bug report from Greg A. Woods.
diff --git a/tests/nodepcomp.test b/tests/nodepcomp.test
index 52dd99692..1ae56a4bd 100755
--- a/tests/nodepcomp.test
+++ b/tests/nodepcomp.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure depcomp isn't always required.
diff --git a/tests/nodist.test b/tests/nodist.test
index 32b5f1536..10409d988 100755
--- a/tests/nodist.test
+++ b/tests/nodist.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure dist_*_SOURCES and nodist_*_SOURCES work.
diff --git a/tests/nodist2.test b/tests/nodist2.test
index ce99e7522..c92971399 100755
--- a/tests/nodist2.test
+++ b/tests/nodist2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure nodist_noinst_HEADERS work.
# For PR 249.
diff --git a/tests/nodist3.test b/tests/nodist3.test
index 13c4115f0..0acf8887a 100755
--- a/tests/nodist3.test
+++ b/tests/nodist3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure no-dist option works.
diff --git a/tests/nogzip.test b/tests/nogzip.test
index 58b4d09de..f15cd9b53 100755
--- a/tests/nogzip.test
+++ b/tests/nogzip.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check support for no-dist-gzip
diff --git a/tests/nogzip2.test b/tests/nogzip2.test
index d2b1d42fd..9a4f9a707 100755
--- a/tests/nogzip2.test
+++ b/tests/nogzip2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check diagnostic for no-dist-gzip without dist-*.
diff --git a/tests/noinst.test b/tests/noinst.test
index a5693eb8f..32d88c02e 100755
--- a/tests/noinst.test
+++ b/tests/noinst.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check to make sure "make install" will build all in directory with
# nothing to install.
diff --git a/tests/noinstdir.test b/tests/noinstdir.test
index 315d51b34..d756d5ee9 100755
--- a/tests/noinstdir.test
+++ b/tests/noinstdir.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that noinst_* and check_* are not installed.
# From Pavel Roskin.
diff --git a/tests/nolink.test b/tests/nolink.test
index c3e98036d..ee3f53d53 100755
--- a/tests/nolink.test
+++ b/tests/nolink.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Automake does not emit a link rule for unknown languages.
diff --git a/tests/nostdinc.test b/tests/nostdinc.test
index 35c6d8bad..c74563321 100755
--- a/tests/nostdinc.test
+++ b/tests/nostdinc.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure nostdinc option works correctly.
diff --git a/tests/number.test b/tests/number.test
index 583995168..3365c746d 100755
--- a/tests/number.test
+++ b/tests/number.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure _OBJECTS only generated once. Bug reported by
# Joerg-Martin Schwarz.
diff --git a/tests/obsolete.test b/tests/obsolete.test
index 661daf5c9..8b79af36c 100755
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure obsolete macros can be autoupdated.
diff --git a/tests/order.test b/tests/order.test
index 8c9aec075..ff9813836 100755
--- a/tests/order.test
+++ b/tests/order.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure AC_DEFUN is handled correctly. This test isn't named very
# well. Report from Jim Meyering.
diff --git a/tests/outdir.test b/tests/outdir.test
index 7ad12e188..c4aec9778 100755
--- a/tests/outdir.test
+++ b/tests/outdir.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to ensure that --output-dir works. Bug report from Joshua
# Cowan.
diff --git a/tests/output.test b/tests/output.test
index cbb1fee8e..4869e5a38 100755
--- a/tests/output.test
+++ b/tests/output.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure files listed in AC_OUTPUT are found.
diff --git a/tests/output10.test b/tests/output10.test
index 21fab9a22..d095e54ea 100755
--- a/tests/output10.test
+++ b/tests/output10.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure an AC_CONFIG_FILES can have an AC_CONFIG_FILES output as input.
# This is comparable to output9.test, but testing Makefile rules.
diff --git a/tests/output11.test b/tests/output11.test
index 9a7765367..5d1b53e8b 100755
--- a/tests/output11.test
+++ b/tests/output11.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure an AC_CONFIG_FILES ignore filenames with shell variables.
diff --git a/tests/output12.test b/tests/output12.test
index 307df5e80..ba0a98782 100755
--- a/tests/output12.test
+++ b/tests/output12.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure an AC_CONFIG_FILES process filenames with AC_SUBST variables.
diff --git a/tests/output2.test b/tests/output2.test
index b2931457a..1dc64abb6 100755
--- a/tests/output2.test
+++ b/tests/output2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Another AC_OUTPUT test. From report by Ulrich Drepper.
diff --git a/tests/output3.test b/tests/output3.test
index 44bd6f08e..df01d2c0f 100755
--- a/tests/output3.test
+++ b/tests/output3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Yet another AC_OUTPUT test.
diff --git a/tests/output4.test b/tests/output4.test
index f18f190c0..32dc4498d 100755
--- a/tests/output4.test
+++ b/tests/output4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# It's hard to believe there are so many AC_OUTPUT-related bugs.
diff --git a/tests/output5.test b/tests/output5.test
index 5ba0cdf1a..f3d44c3f2 100755
--- a/tests/output5.test
+++ b/tests/output5.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Automake complains when there is no Makefile specified.
diff --git a/tests/output6.test b/tests/output6.test
index e245d318f..7ffc2252e 100755
--- a/tests/output6.test
+++ b/tests/output6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check for support for colon separated input files in AC_CONFIG_FILES
diff --git a/tests/output7.test b/tests/output7.test
index f26251cb6..869a440e1 100755
--- a/tests/output7.test
+++ b/tests/output7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check for support for colon separated input files in AC_CONFIG_FILES,
# with sources in sub directories.
diff --git a/tests/output8.test b/tests/output8.test
index 7ef82b063..bb5c75596 100755
--- a/tests/output8.test
+++ b/tests/output8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check AC_CONFIG_FILES support for files starting with `../'.
# Report from Bruno Haible.
diff --git a/tests/output9.test b/tests/output9.test
index d2f4e907b..183f8ef0d 100755
--- a/tests/output9.test
+++ b/tests/output9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure an AC_CONFIG_FILES can have an AC_CONFIG_FILES output as input.
diff --git a/tests/overrid.test b/tests/overrid.test
index 0ac3bcc96..4d677f696 100755
--- a/tests/overrid.test
+++ b/tests/overrid.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure automake -Woverride suggests using TARGET-local instead
# of TARGET when possible.
diff --git a/tests/parse.test b/tests/parse.test
index 78643c2bb..7560c71e3 100755
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure backslash-newline is treated as whitespace.
diff --git a/tests/percent.test b/tests/percent.test
index 960e9dac4..cf789e25d 100755
--- a/tests/percent.test
+++ b/tests/percent.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that -Wportability understands %-style pattern
# rules.
diff --git a/tests/percent2.test b/tests/percent2.test
index 2fafb8ad8..26a81ca46 100755
--- a/tests/percent2.test
+++ b/tests/percent2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Another test for -Wportability warning about %-style rules, plus
# make sure we don't warn about duplicate definition for
diff --git a/tests/phony.test b/tests/phony.test
index ade45ed66..b2c6ff726 100755
--- a/tests/phony.test
+++ b/tests/phony.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure .PHONY can be given dependencies several times.
# From Ralf Corsepius.
diff --git a/tests/pluseq.test b/tests/pluseq.test
index de22bcc50..f129e3494 100755
--- a/tests/pluseq.test
+++ b/tests/pluseq.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test `+=' functionality.
diff --git a/tests/pluseq10.test b/tests/pluseq10.test
index f9c400506..00c7a5c23 100755
--- a/tests/pluseq10.test
+++ b/tests/pluseq10.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for += and backslashes.
# Reported by Ralf Corsepius.
diff --git a/tests/pluseq2.test b/tests/pluseq2.test
index 3fa3011f8..0c5ca25a9 100755
--- a/tests/pluseq2.test
+++ b/tests/pluseq2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test `+=' with conditionals.
diff --git a/tests/pluseq3.test b/tests/pluseq3.test
index 85f31ca75..7b2d19c21 100755
--- a/tests/pluseq3.test
+++ b/tests/pluseq3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Another `+=' test with conditionals.
diff --git a/tests/pluseq4.test b/tests/pluseq4.test
index 456b2caed..13c3ed958 100755
--- a/tests/pluseq4.test
+++ b/tests/pluseq4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Yet another `+=' test.
diff --git a/tests/pluseq5.test b/tests/pluseq5.test
index 2736c4b48..b1e2f3c6c 100755
--- a/tests/pluseq5.test
+++ b/tests/pluseq5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for another `+=' problem. Report from Brian Jones.
diff --git a/tests/pluseq6.test b/tests/pluseq6.test
index a130868c2..0fe8741ab 100755
--- a/tests/pluseq6.test
+++ b/tests/pluseq6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test that `+=' works with standard header-vars.
diff --git a/tests/pluseq7.test b/tests/pluseq7.test
index e2cc6dcdc..56d29f047 100755
--- a/tests/pluseq7.test
+++ b/tests/pluseq7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test that `+=' fails when required.
diff --git a/tests/pluseq8.test b/tests/pluseq8.test
index 12c910df4..8a3bc55ed 100755
--- a/tests/pluseq8.test
+++ b/tests/pluseq8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Another `+=' test. From Paul Berrevoets.
diff --git a/tests/pluseq9.test b/tests/pluseq9.test
index 828485a57..79b365a46 100755
--- a/tests/pluseq9.test
+++ b/tests/pluseq9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test the += diagnostics.
diff --git a/tests/postproc.test b/tests/postproc.test
index 7259b29d8..801b4b2d5 100755
--- a/tests/postproc.test
+++ b/tests/postproc.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check to make sure we recognize a Makefile.in, even if post-processed
# and renamed.
diff --git a/tests/ppf77.test b/tests/ppf77.test
index b9c4edd7b..93a31b494 100755
--- a/tests/ppf77.test
+++ b/tests/ppf77.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure preprocessed F77 works.
# Report from Jochen Kuepper.
diff --git a/tests/pr2.test b/tests/pr2.test
index 3b0cac49b..b9bf5e5fa 100755
--- a/tests/pr2.test
+++ b/tests/pr2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported in PR 2.
diff --git a/tests/pr204.test b/tests/pr204.test
index 752800b66..b50208892 100755
--- a/tests/pr204.test
+++ b/tests/pr204.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# For PR 204.
# Sources derived from nodist_ sources should not be distributed.
diff --git a/tests/pr211.test b/tests/pr211.test
index d2acb0a62..4dc049a71 100755
--- a/tests/pr211.test
+++ b/tests/pr211.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 211.
diff --git a/tests/pr220.test b/tests/pr220.test
index 2933a058a..0d4fac8e2 100755
--- a/tests/pr220.test
+++ b/tests/pr220.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR automake/220.
diff --git a/tests/pr224.test b/tests/pr224.test
index 30eb323fd..a86c82519 100755
--- a/tests/pr224.test
+++ b/tests/pr224.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for $(top_srcdir) with dependencies.
diff --git a/tests/pr229.test b/tests/pr229.test
index b5e4b66fb..1d20bad74 100755
--- a/tests/pr229.test
+++ b/tests/pr229.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure AC_CYGWIN requires config.{sub,guess}.
# Reported by James Youngman.
diff --git a/tests/pr243.test b/tests/pr243.test
index eb48cde03..c077a259c 100755
--- a/tests/pr243.test
+++ b/tests/pr243.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 243.
diff --git a/tests/pr266.test b/tests/pr266.test
index 06e66d655..4731f22fc 100755
--- a/tests/pr266.test
+++ b/tests/pr266.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 266.
diff --git a/tests/pr279-2.test b/tests/pr279-2.test
index 9423c3122..83051ebf5 100755
--- a/tests/pr279-2.test
+++ b/tests/pr279-2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Another test related to PR 279.
diff --git a/tests/pr279.test b/tests/pr279.test
index f1833550d..e7c3a92d0 100755
--- a/tests/pr279.test
+++ b/tests/pr279.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 279.
diff --git a/tests/pr287.test b/tests/pr287.test
index 2526909eb..674552fd6 100755
--- a/tests/pr287.test
+++ b/tests/pr287.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 287: empty SUBDIRS.
diff --git a/tests/pr300-lib.test b/tests/pr300-lib.test
index f0fa09551..6addd79c4 100755
--- a/tests/pr300-lib.test
+++ b/tests/pr300-lib.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that installing subdirectory libraries works.
# PR/300
diff --git a/tests/pr300-ltlib.test b/tests/pr300-ltlib.test
index f695dbfe3..4fb83f5c9 100755
--- a/tests/pr300-ltlib.test
+++ b/tests/pr300-ltlib.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that installing subdirectory libtool libraries works.
# PR/300
diff --git a/tests/pr300-prog.test b/tests/pr300-prog.test
index 9aba5e6ab..4e567ca87 100755
--- a/tests/pr300-prog.test
+++ b/tests/pr300-prog.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that installing subdirectory programs works.
# PR/300
diff --git a/tests/pr307.test b/tests/pr307.test
index 2d3adead6..3383a9285 100755
--- a/tests/pr307.test
+++ b/tests/pr307.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 307: depcomp with depmode=dashmstdout libtool race condition
# Report from Laurent Morichetti.
diff --git a/tests/pr401.test b/tests/pr401.test
index d15d23dec..d26301e1e 100755
--- a/tests/pr401.test
+++ b/tests/pr401.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check support for AC_CONFIG_LIBOBJ_DIR vs LIBOBJS.
# (pr401b.test and pr401c.test do the same for LTLIBOBJS and ALLOCA)
diff --git a/tests/pr401b.test b/tests/pr401b.test
index f87105602..f14d83d00 100755
--- a/tests/pr401b.test
+++ b/tests/pr401b.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check support for AC_CONFIG_LIBOBJ_DIR vs LTLIBOBJS.
# (pr401.test and pr401c.test do the same for LIBOBJS and ALLOCA)
diff --git a/tests/pr401c.test b/tests/pr401c.test
index 6874311e7..7c9860656 100755
--- a/tests/pr401c.test
+++ b/tests/pr401c.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check support for AC_CONFIG_LIBOBJ_DIR vs ALLOCA.
# (pr401.test and pr401b.test do the same for LIBOBJS and LTLIBOBJS)
diff --git a/tests/pr72.test b/tests/pr72.test
index 9b08645f9..cea8de012 100755
--- a/tests/pr72.test
+++ b/tests/pr72.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 72
required=libtool
diff --git a/tests/pr87.test b/tests/pr87.test
index b973747e5..1b5885117 100755
--- a/tests/pr87.test
+++ b/tests/pr87.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR automake/87.
diff --git a/tests/pr9.test b/tests/pr9.test
index f018f0b75..2918a18dc 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in PR 9.
diff --git a/tests/prefix.test b/tests/prefix.test
index 329219886..db1f72843 100755
--- a/tests/prefix.test
+++ b/tests/prefix.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure range of prefixes can be extended
diff --git a/tests/primary.test b/tests/primary.test
index 3b9915971..07bc83a65 100755
--- a/tests/primary.test
+++ b/tests/primary.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure errors in am_install_var work.
diff --git a/tests/primary2.test b/tests/primary2.test
index fccbf4f4b..5b777cc2a 100755
--- a/tests/primary2.test
+++ b/tests/primary2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure errors in am_install_var work.
diff --git a/tests/primary3.test b/tests/primary3.test
index b0dc91f12..b6d763a0d 100755
--- a/tests/primary3.test
+++ b/tests/primary3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we can build programs ending in `.la'
diff --git a/tests/proginst.test b/tests/proginst.test
index 842b2336b..e3cc39e21 100755
--- a/tests/proginst.test
+++ b/tests/proginst.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug where when multiple scripts are installed,
# the check for AC_PROG_INSTALL fails.
diff --git a/tests/python.test b/tests/python.test
index e752167ae..7917afe91 100755
--- a/tests/python.test
+++ b/tests/python.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure py_compile is defined.
diff --git a/tests/python10.test b/tests/python10.test
index 784b73645..6014181e1 100755
--- a/tests/python10.test
+++ b/tests/python10.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test _PYTHON with conditionals.
diff --git a/tests/python11.test b/tests/python11.test
index f88a5aa38..eb5c0a4a4 100755
--- a/tests/python11.test
+++ b/tests/python11.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test missing python.
diff --git a/tests/python12.test b/tests/python12.test
index 84f71ca9a..a152b62c9 100755
--- a/tests/python12.test
+++ b/tests/python12.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Ensure DESTDIR is not included in byte-compiled files.
diff --git a/tests/python2.test b/tests/python2.test
index b17e26f76..92e8786e1 100755
--- a/tests/python2.test
+++ b/tests/python2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that Automake suggests using AM_PATH_PYTHON.
diff --git a/tests/python3.test b/tests/python3.test
index 45c04ffd9..559c50418 100755
--- a/tests/python3.test
+++ b/tests/python3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we install built python files.
diff --git a/tests/python4.test b/tests/python4.test
index b713461ef..96e596de7 100755
--- a/tests/python4.test
+++ b/tests/python4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test detection of missing Python.
diff --git a/tests/python5.test b/tests/python5.test
index 57669f286..c6a37584d 100755
--- a/tests/python5.test
+++ b/tests/python5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test detection of missing Python.
# Same as python4.test, but requiring a version.
diff --git a/tests/python6.test b/tests/python6.test
index 352752a20..9f5cc211d 100755
--- a/tests/python6.test
+++ b/tests/python6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test detection of missing Python.
# Same as python4.test, but using a custom ACTION-IF-NOT-FOUND.
diff --git a/tests/python7.test b/tests/python7.test
index 4802b27e7..6534426ca 100755
--- a/tests/python7.test
+++ b/tests/python7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test detection of missing Python.
# Same as python6.test, but requiring a version.
diff --git a/tests/python8.test b/tests/python8.test
index 6a2d3c5c9..c6d43e40a 100755
--- a/tests/python8.test
+++ b/tests/python8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test ACTION-IF-TRUE in AM_PATH_PYTHON.
diff --git a/tests/python9.test b/tests/python9.test
index 13df6b804..24d15586a 100755
--- a/tests/python9.test
+++ b/tests/python9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test ACTION-IF-TRUE in AM_PATH_PYTHON.
# Same as python8.test, but requiring a version.
diff --git a/tests/recurs.test b/tests/recurs.test
index d4db672e1..bcaf3aead 100755
--- a/tests/recurs.test
+++ b/tests/recurs.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure recursive variable definitions die.
diff --git a/tests/recurs2.test b/tests/recurs2.test
index 5624a4926..f87588533 100755
--- a/tests/recurs2.test
+++ b/tests/recurs2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure recursive variable definitions die.
# From Jim Meyering.
diff --git a/tests/regex.test b/tests/regex.test
index 2a80b3da3..692b3d200 100755
--- a/tests/regex.test
+++ b/tests/regex.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure AM_WITH_REGEX compiles and runs.
diff --git a/tests/remake.test b/tests/remake.test
index baa63fdae..2d0528597 100755
--- a/tests/remake.test
+++ b/tests/remake.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure remaking rules in subdir are correctly generated.
diff --git a/tests/remake2.test b/tests/remake2.test
index 97d045164..2d673a71c 100755
--- a/tests/remake2.test
+++ b/tests/remake2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure remaking rules in subdir are correct.
diff --git a/tests/remake3.test b/tests/remake3.test
index d52810ada..9f5724224 100755
--- a/tests/remake3.test
+++ b/tests/remake3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure remaking rules work when there is no subdir Makefile.
diff --git a/tests/remake4.test b/tests/remake4.test
index b8b71bd59..0e0f49f0b 100755
--- a/tests/remake4.test
+++ b/tests/remake4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Makefile.in are up to date after make dist.
# This is expected to work even without GNU Make (the GNU Make
diff --git a/tests/remake5.test b/tests/remake5.test
index 1769936df..8544403ed 100755
--- a/tests/remake5.test
+++ b/tests/remake5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that AM_MAINTAINER_MODE disable some rebuild rules,
# but not all.
diff --git a/tests/req.test b/tests/req.test
index cc4fc813e..102e9105e 100755
--- a/tests/req.test
+++ b/tests/req.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure macro used in m4 file is included.
diff --git a/tests/reqd.test b/tests/reqd.test
index 23b41c2c6..e6e9958f3 100755
--- a/tests/reqd.test
+++ b/tests/reqd.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Automake will install several copies of required files if needed.
# Reported by Marius Vollmer.
diff --git a/tests/reqd2.test b/tests/reqd2.test
index cce80231c..a3a2d39ee 100755
--- a/tests/reqd2.test
+++ b/tests/reqd2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Regression test for a bug reported by Andrew Suffield.
# (Automake goes wild and try to rerun itself more than two time
diff --git a/tests/rulepat.test b/tests/rulepat.test
index 956294d9f..8462cc6ea 100755
--- a/tests/rulepat.test
+++ b/tests/rulepat.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure RULE_PATTERN catches strange targets.
diff --git a/tests/scripts.test b/tests/scripts.test
index 73639dabc..eecc25766 100755
--- a/tests/scripts.test
+++ b/tests/scripts.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported by Jim Meyering.
# AC_PROG_INSTALL was required when only noinst_SCRIPTS was defined.
diff --git a/tests/seenc.test b/tests/seenc.test
index 17aa17e08..2975c1c57 100755
--- a/tests/seenc.test
+++ b/tests/seenc.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure C-but-not-CC error works.
diff --git a/tests/sinclude.test b/tests/sinclude.test
index 7c7ab2a4d..29a962cd9 100755
--- a/tests/sinclude.test
+++ b/tests/sinclude.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to see if `m4_sinclude' and `m4_include' works.
diff --git a/tests/space.test b/tests/space.test
index 96c46ec88..633a85673 100755
--- a/tests/space.test
+++ b/tests/space.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test leading space on macro assignment.
diff --git a/tests/specflg.test b/tests/specflg.test
index fbb2df41a..986a6bf89 100755
--- a/tests/specflg.test
+++ b/tests/specflg.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test of flags specific to executable.
diff --git a/tests/specflg2.test b/tests/specflg2.test
index deab08439..985d65e6e 100755
--- a/tests/specflg2.test
+++ b/tests/specflg2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test library-specific flags.
diff --git a/tests/specflg3.test b/tests/specflg3.test
index 51dce65cf..74be2b029 100755
--- a/tests/specflg3.test
+++ b/tests/specflg3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test exe-specific flags with dependency tracking.
diff --git a/tests/specflg6.test b/tests/specflg6.test
index bdbe2ae5b..2c37f52d9 100755
--- a/tests/specflg6.test
+++ b/tests/specflg6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Regression test for multiple rules being generated for each target when
# conditionals are present.
diff --git a/tests/specflg7.test b/tests/specflg7.test
index b48c66d26..d376dc775 100755
--- a/tests/specflg7.test
+++ b/tests/specflg7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# The true/false example from the manual, plus a check for _SHORTNAME.
diff --git a/tests/specflg8.test b/tests/specflg8.test
index 076197228..7bbb8f798 100755
--- a/tests/specflg8.test
+++ b/tests/specflg8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Like the true/false example from the manual,
# with one extra indirection in the sources (PR/315), and
diff --git a/tests/specflg9.test b/tests/specflg9.test
index 40dd7fedf..ba29a95bd 100755
--- a/tests/specflg9.test
+++ b/tests/specflg9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Another check for per-target flag substitutions.
diff --git a/tests/spell.test b/tests/spell.test
index ee0e82f8b..ac65db0e8 100755
--- a/tests/spell.test
+++ b/tests/spell.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure misspellings in _SOURCES variables cause failure.
diff --git a/tests/spell2.test b/tests/spell2.test
index bac6699b9..cf6cda76a 100755
--- a/tests/spell2.test
+++ b/tests/spell2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure misspellings in _SOURCES variables cause failure.
diff --git a/tests/spell3.test b/tests/spell3.test
index d228e4149..5b100829c 100755
--- a/tests/spell3.test
+++ b/tests/spell3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure some internal _DEPENDENCIES variables don't cause
# errors.
diff --git a/tests/spelling.test b/tests/spelling.test
index 9c50a8ab9..70701ebb6 100755
--- a/tests/spelling.test
+++ b/tests/spelling.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that misspelled prefixes actually cause error.
diff --git a/tests/spy.test b/tests/spy.test
index bb4f0832e..61ad48f3f 100755
--- a/tests/spy.test
+++ b/tests/spy.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check whether double colon rules work. The Unix V7 make manual
# mentions double-colon rules, but POSIX does not. They seem to be
diff --git a/tests/srcsub.test b/tests/srcsub.test
index aeb2cff75..66cba369d 100755
--- a/tests/srcsub.test
+++ b/tests/srcsub.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure config sub in _SOURCES fails.
diff --git a/tests/srcsub2.test b/tests/srcsub2.test
index 254f5d0e6..443d235ca 100755
--- a/tests/srcsub2.test
+++ b/tests/srcsub2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure config sub in _SOURCES fails.
diff --git a/tests/stamph2.test b/tests/stamph2.test
index 890a91b81..f16d00b5c 100755
--- a/tests/stamph2.test
+++ b/tests/stamph2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure stamp-h* files are created where we expect
. ./defs || exit 1
diff --git a/tests/stdlib.test b/tests/stdlib.test
index 9c0282d65..bb5647dbf 100755
--- a/tests/stdlib.test
+++ b/tests/stdlib.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test "not a standard library" error.
diff --git a/tests/stdlib2.test b/tests/stdlib2.test
index 37102f748..e8143060f 100755
--- a/tests/stdlib2.test
+++ b/tests/stdlib2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check for AM_LDFLAGS = -module
# Report from Kevin P. Fleming.
diff --git a/tests/strip.test b/tests/strip.test
index a0cb3934e..f2ec70633 100755
--- a/tests/strip.test
+++ b/tests/strip.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for install-strip.
diff --git a/tests/subcond.test b/tests/subcond.test
index d44c29dd1..746743dcc 100755
--- a/tests/subcond.test
+++ b/tests/subcond.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# It is ok to have a conditional SUBDIRS when using gettext.
required=gettext
diff --git a/tests/subcond2.test b/tests/subcond2.test
index 2b0dd281a..e4aafdf1d 100755
--- a/tests/subcond2.test
+++ b/tests/subcond2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# The for conditional SUBDIRS.
# SUBDIRS + AM_CONDITIONAL setup from the manual.
diff --git a/tests/subcond3.test b/tests/subcond3.test
index 59ecd00f0..6da3fac19 100755
--- a/tests/subcond3.test
+++ b/tests/subcond3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# The for conditional SUBDIRS.
# SUBDIRS + AC_SUBST setup from the manual.
diff --git a/tests/subdir.test b/tests/subdir.test
index f11813e8c..a237b25c4 100755
--- a/tests/subdir.test
+++ b/tests/subdir.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure install-sh and mkinstalldirs correctly found in
# subdirs.
diff --git a/tests/subdir2.test b/tests/subdir2.test
index ffb9dbe0b..9a0c3a6d1 100755
--- a/tests/subdir2.test
+++ b/tests/subdir2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure sub-sub-dirs work correctly.
diff --git a/tests/subdir3.test b/tests/subdir3.test
index 37f15a256..e20a9d682 100755
--- a/tests/subdir3.test
+++ b/tests/subdir3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure subdir source file generates explicit dependency.
diff --git a/tests/subdir4.test b/tests/subdir4.test
index 977e89065..152e9f353 100755
--- a/tests/subdir4.test
+++ b/tests/subdir4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure a top-level depcomp file is found when
# AC_CONFIG_AUX_DIR is not specified.
diff --git a/tests/subdir5.test b/tests/subdir5.test
index b19ffb446..32f90d9ae 100755
--- a/tests/subdir5.test
+++ b/tests/subdir5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that adding a new directory works.
# This test runs `make' from the top-level directory, subdir8.test
diff --git a/tests/subdir6.test b/tests/subdir6.test
index 74f7ded61..2cfb61845 100755
--- a/tests/subdir6.test
+++ b/tests/subdir6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure config headers in subdirectories are cleaned.
diff --git a/tests/subdir7.test b/tests/subdir7.test
index 0e439d884..396c08113 100755
--- a/tests/subdir7.test
+++ b/tests/subdir7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Naming a subdirectory `obj/' is a bad idea. Automake should say so.
diff --git a/tests/subdir8.test b/tests/subdir8.test
index 66367a51e..e5514aa74 100755
--- a/tests/subdir8.test
+++ b/tests/subdir8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that adding a new directory works, even from
# subdirectories. (subdir5.test makes sure it works when make
diff --git a/tests/subdir9.test b/tests/subdir9.test
index 8bd10efa9..a3db23adf 100755
--- a/tests/subdir9.test
+++ b/tests/subdir9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test SUDBIRS with /.
diff --git a/tests/subdirbuiltsources.test b/tests/subdirbuiltsources.test
index 8ad5331ae..cf7254f28 100755
--- a/tests/subdirbuiltsources.test
+++ b/tests/subdirbuiltsources.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure when using SUBDIR that all BUILT_SOURCES are built.
# A bug occurred where subdirs do not have all-recursive or
diff --git a/tests/subobj.test b/tests/subobj.test
index a3c378027..b0566d1b2 100755
--- a/tests/subobj.test
+++ b/tests/subobj.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test of subdir objects with C.
diff --git a/tests/subobj2.test b/tests/subobj2.test
index c8cae901e..8cfad7d06 100755
--- a/tests/subobj2.test
+++ b/tests/subobj2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test of subdir objects with C++.
diff --git a/tests/subobj3.test b/tests/subobj3.test
index 7255392a4..34dc56476 100755
--- a/tests/subobj3.test
+++ b/tests/subobj3.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test of subdir objects with C++.
diff --git a/tests/subobj4.test b/tests/subobj4.test
index f78a36c5c..db845a24c 100755
--- a/tests/subobj4.test
+++ b/tests/subobj4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure `../foo/foo.cpp' generates a rule.
# Report from Dave Brolley.
diff --git a/tests/subobj5.test b/tests/subobj5.test
index 231a44032..ac3fe320b 100755
--- a/tests/subobj5.test
+++ b/tests/subobj5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test of subdir make dist rules.
# From Robert Collins
diff --git a/tests/subobj6.test b/tests/subobj6.test
index 22ea8c169..02a537b91 100755
--- a/tests/subobj6.test
+++ b/tests/subobj6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test of subdir make distclean rules.
# From Robert Collins
diff --git a/tests/subobj7.test b/tests/subobj7.test
index 729b60eb1..dee4fe601 100755
--- a/tests/subobj7.test
+++ b/tests/subobj7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure AM_CFLAGS appears in subdir compilation rule.
# Report from Steve M. Robbins.
diff --git a/tests/subobj8.test b/tests/subobj8.test
index 952a2bb36..75ac91ff7 100755
--- a/tests/subobj8.test
+++ b/tests/subobj8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure `compile' is included when subdir-objects is used in a subdir.
diff --git a/tests/subobj9.test b/tests/subobj9.test
index d68e3dcf2..ecf26661e 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for PR 312.
diff --git a/tests/subobjname.test b/tests/subobjname.test
index 84d5a95d2..62cd4a0ce 100755
--- a/tests/subobjname.test
+++ b/tests/subobjname.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we reuse variables whenever possible, to limit
# combinational explosion. (This test is named after the &subobjname
diff --git a/tests/subpkg.test b/tests/subpkg.test
index ede650593..69ff96b02 100755
--- a/tests/subpkg.test
+++ b/tests/subpkg.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check subpackage handling.
diff --git a/tests/subpkg2.test b/tests/subpkg2.test
index 1c58aae92..fbfc2a95e 100755
--- a/tests/subpkg2.test
+++ b/tests/subpkg2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Try a DIST_SUBDIRS subpackage with no SUBDIRS.
# Report from Gary V. Vaughan.
diff --git a/tests/subst.test b/tests/subst.test
index 173ae7529..4b98ccfbc 100755
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test that AC_SUBST($1) does something sensible. From Ulrich
# Drepper.
diff --git a/tests/subst2.test b/tests/subst2.test
index c743b6e04..f2f2a9fac 100755
--- a/tests/subst2.test
+++ b/tests/subst2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure a multi-line definition cannot be terminated by an empty
# line (when there are @substitutions@ inside).
diff --git a/tests/substre2.test b/tests/substre2.test
index e67b73621..62a6b25ba 100755
--- a/tests/substre2.test
+++ b/tests/substre2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in variable substitution references, where
# undefined variables break later substitutions.
diff --git a/tests/substref.test b/tests/substref.test
index 89218c111..0278632c6 100755
--- a/tests/substref.test
+++ b/tests/substref.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug in variable substitution references when left hand pattern is
# null.
diff --git a/tests/substtarg.test b/tests/substtarg.test
index 2aba499c6..00564cfd5 100755
--- a/tests/substtarg.test
+++ b/tests/substtarg.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test that substitutions in variables work.
# From Lars J. Aas.
diff --git a/tests/suffix.test b/tests/suffix.test
index 61a210604..ada1394df 100755
--- a/tests/suffix.test
+++ b/tests/suffix.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure a suffix rule for C compilation is produced.
diff --git a/tests/suffix10.test b/tests/suffix10.test
index 2e4e04733..92cbf5562 100755
--- a/tests/suffix10.test
+++ b/tests/suffix10.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that derivations work with .lo too.
# (related to PR/37)
diff --git a/tests/suffix11.test b/tests/suffix11.test
index 79618751f..8841424cd 100755
--- a/tests/suffix11.test
+++ b/tests/suffix11.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Tests that Automake understand multiple suffix rules on the same line.
# PR/371 and PR/372: Reported by Duncan Gibson.
diff --git a/tests/suffix2.test b/tests/suffix2.test
index 7cc864135..dd38d6e7b 100755
--- a/tests/suffix2.test
+++ b/tests/suffix2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure .c.o rule is only included once.
required=libtoolize
diff --git a/tests/suffix3.test b/tests/suffix3.test
index e5935cd72..b75f4d2df 100755
--- a/tests/suffix3.test
+++ b/tests/suffix3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that suffix rules chain.
diff --git a/tests/suffix4.test b/tests/suffix4.test
index 19c1bcaab..c39e33a33 100755
--- a/tests/suffix4.test
+++ b/tests/suffix4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure Automake doesn't abort on user-defined extensions.
# Based on a report from Dmitry Mikhin <dmitrym@acres.com.au>.
diff --git a/tests/suffix5.test b/tests/suffix5.test
index a7593ce5f..817fea9fd 100755
--- a/tests/suffix5.test
+++ b/tests/suffix5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
required=libtool
diff --git a/tests/suffix6.test b/tests/suffix6.test
index a5e0e4791..989b5fda0 100755
--- a/tests/suffix6.test
+++ b/tests/suffix6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure Automake supports implicit rules with dot-less
# extensions. Also make sure that `.o' is handled like `.$(OBJEXT)'.
diff --git a/tests/suffix7.test b/tests/suffix7.test
index ae69d6cb3..a70724315 100755
--- a/tests/suffix7.test
+++ b/tests/suffix7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure Automake supports implicit rules "confusing"
# extensions. Inspired by a mail from Alex Hornby.
diff --git a/tests/suffix8.test b/tests/suffix8.test
index f04aff0f0..895d2a1f4 100755
--- a/tests/suffix8.test
+++ b/tests/suffix8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure Automake supports multiple derivations for the same suffix.
# PR/37
diff --git a/tests/suffix9.test b/tests/suffix9.test
index 68eac14f2..8ef400735 100755
--- a/tests/suffix9.test
+++ b/tests/suffix9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that Automake choose the shorter route between suffixes
# (related to PR/37)
diff --git a/tests/symlink.test b/tests/symlink.test
index 974edb6f7..e00118aef 100755
--- a/tests/symlink.test
+++ b/tests/symlink.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we get an error if symlink creation fails.
# Reported by Joerg-Martin Schwarz
diff --git a/tests/symlink2.test b/tests/symlink2.test
index dc6a8cc09..04037274d 100755
--- a/tests/symlink2.test
+++ b/tests/symlink2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that `automake -a' redirects dangling symlinks.
diff --git a/tests/symlink3.test b/tests/symlink3.test
index 23040fe52..40622f444 100755
--- a/tests/symlink3.test
+++ b/tests/symlink3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that `automake --force-missing' works.
diff --git a/tests/syntax.test b/tests/syntax.test
index 733112e24..956e850bb 100755
--- a/tests/syntax.test
+++ b/tests/syntax.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for error for bad syntax.
diff --git a/tests/tags.test b/tests/tags.test
index 8715bdf0d..223e94d61 100755
--- a/tests/tags.test
+++ b/tests/tags.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported by Harlan Stenn: the tags target doesn't work
# when there are only headers in a directory.
diff --git a/tests/tagsub.test b/tests/tagsub.test
index c275403ce..8277eb314 100755
--- a/tests/tagsub.test
+++ b/tests/tagsub.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure tags and subdirs work correctly. Bug report by
# François Pinard, and later by Akim Demaille.
diff --git a/tests/tar.test b/tests/tar.test
index 16d54f491..cf65a979f 100755
--- a/tests/tar.test
+++ b/tests/tar.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check the tar-ustar option.
diff --git a/tests/tar2.test b/tests/tar2.test
index c892411e2..714d11d6a 100755
--- a/tests/tar2.test
+++ b/tests/tar2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check the tar-pax option.
diff --git a/tests/tar3.test b/tests/tar3.test
index 8d4b9c656..c79385b7b 100755
--- a/tests/tar3.test
+++ b/tests/tar3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check the tar options diagnostics.
diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index 7a105f26c..d379d01b1 100755
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure target specific CFLAGS work
# Assar Westerlund <assar@sics.se>
diff --git a/tests/targetclash.test b/tests/targetclash.test
index 987645285..7038b66f4 100755
--- a/tests/targetclash.test
+++ b/tests/targetclash.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that target clashes are diagnosed.
diff --git a/tests/transform.test b/tests/transform.test
index 721f05216..048eb5007 100755
--- a/tests/transform.test
+++ b/tests/transform.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that --program-transform works.
diff --git a/tests/txinfo.test b/tests/txinfo.test
index dae8c3930..0defbc76e 100755
--- a/tests/txinfo.test
+++ b/tests/txinfo.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to ensure texinfo.tex included in distribution. Bug report by
# Jim Meyering.
diff --git a/tests/txinfo10.test b/tests/txinfo10.test
index 895870185..b6565ff09 100755
--- a/tests/txinfo10.test
+++ b/tests/txinfo10.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure dvi target recurses into subdir.
# Reported by Pavel Roskin
diff --git a/tests/txinfo13.test b/tests/txinfo13.test
index 3d1cb6a1f..a5202c6a7 100755
--- a/tests/txinfo13.test
+++ b/tests/txinfo13.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check for subdir Texinfo.
# PR/343
diff --git a/tests/txinfo16.test b/tests/txinfo16.test
index 89ea9f211..c522eafdd 100755
--- a/tests/txinfo16.test
+++ b/tests/txinfo16.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that info files are not built in $(srcdir).
diff --git a/tests/txinfo17.test b/tests/txinfo17.test
index de19f255d..573d5e85b 100755
--- a/tests/txinfo17.test
+++ b/tests/txinfo17.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Automake uses the _first_ @setfilname it sees.
# Report from Karl Berry.
diff --git a/tests/txinfo18.test b/tests/txinfo18.test
index d1872f843..08f8d5920 100755
--- a/tests/txinfo18.test
+++ b/tests/txinfo18.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we clean index files, even if they are not used at the top-level.
# Only *new* indexes need to be declared at the top-level.
diff --git a/tests/txinfo19.test b/tests/txinfo19.test
index 7c082506b..cc95c2d6c 100755
--- a/tests/txinfo19.test
+++ b/tests/txinfo19.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test support for DJGPP's .iNN info files.
diff --git a/tests/txinfo2.test b/tests/txinfo2.test
index 4e7dec738..1c6384cc8 100755
--- a/tests/txinfo2.test
+++ b/tests/txinfo2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to ensure that a ".info~" file doesn't end up in the
# distribution. Bug report from Greg McGary.
diff --git a/tests/txinfo20.test b/tests/txinfo20.test
index bcc3b8ad0..127a1b13b 100755
--- a/tests/txinfo20.test
+++ b/tests/txinfo20.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure info files survive makeinfo errors.
diff --git a/tests/txinfo21.test b/tests/txinfo21.test
index 265cc5726..c9e704d06 100755
--- a/tests/txinfo21.test
+++ b/tests/txinfo21.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test support for building HTML documentation, and the many
# install-DOC flavors.
diff --git a/tests/txinfo22.test b/tests/txinfo22.test
index 51c1de075..b73365e6f 100755
--- a/tests/txinfo22.test
+++ b/tests/txinfo22.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure the user can override TEXINFO_TEX.
# Report from Tom Tromey.
diff --git a/tests/txinfo23.test b/tests/txinfo23.test
index 12d49dfc6..3136c6a55 100755
--- a/tests/txinfo23.test
+++ b/tests/txinfo23.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check for subdir Texinfo in $(srcdir).
# (Similar to txinfo13.test, plus DISTCLEANFILES.)
diff --git a/tests/txinfo24.test b/tests/txinfo24.test
index d48ccab87..7405f5792 100755
--- a/tests/txinfo24.test
+++ b/tests/txinfo24.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that info files are built in builddir when needed.
# (Similar to txinfo16.test, plus CLEANFILES.)
diff --git a/tests/txinfo25.test b/tests/txinfo25.test
index 944c9a196..e6d31c030 100755
--- a/tests/txinfo25.test
+++ b/tests/txinfo25.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Similar to texinfo24.test, but with two info files, only one of
# which being cleaned.
diff --git a/tests/txinfo26.test b/tests/txinfo26.test
index 9350038d5..a432c12ce 100755
--- a/tests/txinfo26.test
+++ b/tests/txinfo26.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure Texinfo installation works when absolute --srcdir is used.
# PR/408
diff --git a/tests/txinfo27.test b/tests/txinfo27.test
index 4ae7e52a6..c29f2d76b 100755
--- a/tests/txinfo27.test
+++ b/tests/txinfo27.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure install-info works even if no-installinfo is given.
diff --git a/tests/txinfo28.test b/tests/txinfo28.test
index 59254adf8..b79a933de 100755
--- a/tests/txinfo28.test
+++ b/tests/txinfo28.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that info files are built in builddir when needed.
# Similar to txinfo24.test, but obfuscating filenames with variable references.
diff --git a/tests/txinfo29.test b/tests/txinfo29.test
index e39447f5d..f18a9e063 100755
--- a/tests/txinfo29.test
+++ b/tests/txinfo29.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that INFO_DEPS can be overridden.
# Report from Bruce Korb.
diff --git a/tests/txinfo3.test b/tests/txinfo3.test
index 120c3806d..72fdaede8 100755
--- a/tests/txinfo3.test
+++ b/tests/txinfo3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure .info-less @setfilename works.
diff --git a/tests/txinfo4.test b/tests/txinfo4.test
index faeecdc8c..0c7f20dc4 100755
--- a/tests/txinfo4.test
+++ b/tests/txinfo4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure non-empty, non-info suffixes are diagnosed.
diff --git a/tests/txinfo5.test b/tests/txinfo5.test
index c664a0cbf..715888906 100755
--- a/tests/txinfo5.test
+++ b/tests/txinfo5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure that texinfo.tex is not required by --cygnus.
# Report from Ian Taylor.
diff --git a/tests/txinfo6.test b/tests/txinfo6.test
index 8a11ec055..f7a4e2912 100755
--- a/tests/txinfo6.test
+++ b/tests/txinfo6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure `.txi' extension works.
. ./defs || exit 1
diff --git a/tests/txinfo7.test b/tests/txinfo7.test
index 6fc5248d7..d61e69477 100755
--- a/tests/txinfo7.test
+++ b/tests/txinfo7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure texinfo.tex correctly installed by -a. Bug report
# by Per Cederqvist.
diff --git a/tests/txinfo8.test b/tests/txinfo8.test
index a42998564..b4c251cac 100755
--- a/tests/txinfo8.test
+++ b/tests/txinfo8.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure texinfo.tex is correctly installed and disted by
# -a when we're using AC_CONFIG_AUX_DIR. Bug report by by Per
diff --git a/tests/txinfo9.test b/tests/txinfo9.test
index f788b06fa..4048bd772 100755
--- a/tests/txinfo9.test
+++ b/tests/txinfo9.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure we only create dist-info target once.
# This is just an example -- basically for many targets in texinfos.am
diff --git a/tests/unused.test b/tests/unused.test
index 6c3ba88f2..e8a0434e9 100755
--- a/tests/unused.test
+++ b/tests/unused.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for failing check for unused macros. From Johan Danielsson.
. ./defs || exit 1
diff --git a/tests/vars.test b/tests/vars.test
index f84a04fba..c6a404329 100755
--- a/tests/vars.test
+++ b/tests/vars.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test various variable definitions that include an '=' sign
# From Raja R Harinath
diff --git a/tests/vars3.test b/tests/vars3.test
index 9f1d0dbad..c2efd65b5 100755
--- a/tests/vars3.test
+++ b/tests/vars3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Check that Automake warns about variables containing spaces
# and other non-POSIX characters.
diff --git a/tests/vartar.test b/tests/vartar.test
index 0c45ff558..8598faa25 100755
--- a/tests/vartar.test
+++ b/tests/vartar.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Targets and macros are two different name spaces.
diff --git a/tests/version.test b/tests/version.test
index b9753dc24..eb24aba2d 100755
--- a/tests/version.test
+++ b/tests/version.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure [...] is ok in version number. Report from Jim
# Meyering.
diff --git a/tests/version2.test b/tests/version2.test
index 7ae7d0a9b..e21e37ac3 100755
--- a/tests/version2.test
+++ b/tests/version2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure 3rd arg to AM_INIT_AUTOMAKE not picked up in
# version. From Joel Weber.
diff --git a/tests/version3.test b/tests/version3.test
index 082bce331..483560c42 100755
--- a/tests/version3.test
+++ b/tests/version3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure version in AUTOMAKE_OPTIONS works.
diff --git a/tests/version4.test b/tests/version4.test
index d8c1ceac6..6888e4836 100755
--- a/tests/version4.test
+++ b/tests/version4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure we are compatible with the 1.4-p1 series.
diff --git a/tests/version6.test b/tests/version6.test
index ba81830bc..9ec066093 100755
--- a/tests/version6.test
+++ b/tests/version6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure the current version can be required.
diff --git a/tests/version7.test b/tests/version7.test
index 0a65f6a25..bcd1da6b1 100755
--- a/tests/version7.test
+++ b/tests/version7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for a special setup where the package's version isn't defined
# in configure.in. We want GNU Make for this test (part of the test
diff --git a/tests/version8.test b/tests/version8.test
index ee07ac464..a68174955 100755
--- a/tests/version8.test
+++ b/tests/version8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Calling AM_AUTOMAKE_VERSION by hand is a bug.
diff --git a/tests/vpath.test b/tests/vpath.test
index ac978d8be..65cb9b962 100755
--- a/tests/vpath.test
+++ b/tests/vpath.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure VPATH can be overridden.
# Report from Anthony Green.
diff --git a/tests/vtexi.test b/tests/vtexi.test
index 03d42cf8a..9b67d0527 100755
--- a/tests/vtexi.test
+++ b/tests/vtexi.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
. ./defs || exit 1
diff --git a/tests/vtexi2.test b/tests/vtexi2.test
index 6ae13e7b5..eddefece9 100755
--- a/tests/vtexi2.test
+++ b/tests/vtexi2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for bug reported by Glenn Amerine:
# When automake sees version.texi is being included by a texi file,
diff --git a/tests/warnopts.test b/tests/warnopts.test
index 8b93e638b..85c6d4c51 100755
--- a/tests/warnopts.test
+++ b/tests/warnopts.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that we can enable or disable warnings on a per-file basis.
diff --git a/tests/werror.test b/tests/werror.test
index d4fa16859..214023111 100755
--- a/tests/werror.test
+++ b/tests/werror.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure --Werror and --add-missing work together.
diff --git a/tests/werror2.test b/tests/werror2.test
index ecee4d856..81e2a158c 100755
--- a/tests/werror2.test
+++ b/tests/werror2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Make sure that Makefile.in is not overwritten on error. Otherwise
# although the rebuilding rules would fail on error, they would
diff --git a/tests/whoami.test b/tests/whoami.test
index e43fc77a5..fae8f9c64 100755
--- a/tests/whoami.test
+++ b/tests/whoami.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure aclocal doesn't barf on "WHO_AM_I=...". Report
# from Johan Danielsson (and a very nice bug report, too, I might
diff --git a/tests/xsource.test b/tests/xsource.test
index 5ba93d96c..2f5011b0c 100755
--- a/tests/xsource.test
+++ b/tests/xsource.test
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure multiple source files with the same object
# file causes error.
diff --git a/tests/yacc.test b/tests/yacc.test
index 15644e926..bac48279c 100755
--- a/tests/yacc.test
+++ b/tests/yacc.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure intermediate .c file is built from yacc source.
# Bug from Thomas Morgan.
diff --git a/tests/yacc2.test b/tests/yacc2.test
index e39cb7ac8..8a96656ed 100755
--- a/tests/yacc2.test
+++ b/tests/yacc2.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure intermediate .h file is not generated nor removed
# if (AM_)?YFLAGS do not contain -d. Requested by Jim Meyering.
diff --git a/tests/yacc3.test b/tests/yacc3.test
index e5f309a97..6f30c224b 100755
--- a/tests/yacc3.test
+++ b/tests/yacc3.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Ensure that generated .h file is distributed iff we have -d in
# (AM_)?YFLAGS.
diff --git a/tests/yacc4.test b/tests/yacc4.test
index 2150917da..e0d666403 100755
--- a/tests/yacc4.test
+++ b/tests/yacc4.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Some simple tests of ylwrap functionality.
diff --git a/tests/yacc5.test b/tests/yacc5.test
index 02f868ea7..5038886d5 100755
--- a/tests/yacc5.test
+++ b/tests/yacc5.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test of yacc functionality, derived from GNU binutils
# by Tim Van Holder.
diff --git a/tests/yacc6.test b/tests/yacc6.test
index 081e53268..ed4ba9378 100755
--- a/tests/yacc6.test
+++ b/tests/yacc6.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure ylwrap put in right location.
# Report from Tim Van Holder.
diff --git a/tests/yacc7.test b/tests/yacc7.test
index a187fda7d..00e3ce601 100755
--- a/tests/yacc7.test
+++ b/tests/yacc7.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure dependencies are generated correctly for .h files.
# Report from Richard Boulton.
diff --git a/tests/yacc8.test b/tests/yacc8.test
index 5f1eaea6a..5dc241c79 100755
--- a/tests/yacc8.test
+++ b/tests/yacc8.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test for subdir parsers.
diff --git a/tests/yaccpp.test b/tests/yaccpp.test
index d9dd0ab1a..df056db8c 100755
--- a/tests/yaccpp.test
+++ b/tests/yaccpp.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Test to make sure yacc + c++ works.
diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
index 42cce6bd2..798f38306 100755
--- a/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@ -15,8 +15,8 @@
#
# You should have received a copy of the GNU General Public License
# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# This test checks that dependent files are updated before including
# in the distribution. `parse.c' depends on `parce.y'. The later is