Index: automake/ChangeLog diff -c automake/ChangeLog:1.676.4.10 automake/ChangeLog:1.676.4.18 *** automake/ChangeLog:1.676.4.10 Tue May 8 17:40:51 2001 --- automake/ChangeLog Thu May 24 13:35:40 2001 *************** *** 1,5 **** ! 2000-05-08 Gary V. Vaughan * Makefile.in: Regenerated. * aclocal.m4: Ditto. * m4/Makefile.in: Ditto. --- 1,48 ---- ! 2001-05-24 Gary V. Vaughan + * configure.in (AM_INIT_AUTOMAKE): Set the fork identifier to + patch level 2, 1.4-p2. + * configure: Regenerated. + * stamp-vti: Ditto. + * version.texi: Ditto. + * NEWS: Updated. + * automake.in (parse arguments): Updated copyright dates. + + * config.sub: Updated from master copy at GNU -- config.guess + has not changed since the last release. + + From "Steve M. Robbins" + * automake.in (scan_one_configure_file): Cope with AC_CONFIG_FILES + macros introduced in autoconf-2.50. + + 2001-05-21 Gary V. Vaughan + + From Christian Holm Christensen : + * automake.in (lang_ppf77_rewrite): This function should have + been defined all along. + (lang_ppf77_finish): Fix the format of the rules we output. + + 2001-05-13 Gary V. Vaughan + + * Makefile.in: Regenerated. + From Peter Breitenlohner : + * Makefile.am (install-data-hook): Take DESTDIR into account + when calculating to installed scripts. + + 2001-05-12 Steve M. Robbins + + * automake.in (handle_dist): Fix makefile fragment emitted when a + distcheck-hook is defined. + + 2001-05-10 Gary V. Vaughan + + * configure.in (AM_INIT_AUTOMAKE): Bumped the version number to + 1.4-p1a. + + 2001-05-08 Gary V. Vaughan + + Automake 1.4-p1 was released. + * Makefile.in: Regenerated. * aclocal.m4: Ditto. * m4/Makefile.in: Ditto. *************** *** 22,28 **** identifier'. (handle_options): Handle fork identifier in version number. ! 2000-05-08 Gary V. Vaughan * automake.in (libtoolize_files): Removed ltconfig from this list, since it is not generated by libtool-1.4 or better. --- 65,71 ---- identifier'. (handle_options): Handle fork identifier in version number. ! 2001-05-08 Gary V. Vaughan * automake.in (libtoolize_files): Removed ltconfig from this list, since it is not generated by libtool-1.4 or better. *************** *** 4436,4442 **** gettext-specific files. (handle_configure): Automatically rebuild ! From Jim Meyering: * automake.in (handle_source_transform): Use \W when quoting regexp. When blah_SOURCES not explicitly defined, still create entry in %deps. --- 4479,4485 ---- gettext-specific files. (handle_configure): Automatically rebuild ! From Jim Meyering: * automake.in (handle_source_transform): Use \W when quoting regexp. When blah_SOURCES not explicitly defined, still create entry in %deps. Index: automake/Makefile.am diff -c automake/Makefile.am:1.126 automake/Makefile.am:1.126.4.1 *** automake/Makefile.am:1.126 Thu Jan 14 12:27:42 1999 --- automake/Makefile.am Sun May 13 16:13:54 2001 *************** *** 29,35 **** install-data-hook: @for prog in $(script_DATA); do \ ! chmod +x $(scriptdir)/$$prog; \ done EXTRA_DIST = acinstall $(pkgdata_DATA) $(script_DATA) --- 29,35 ---- install-data-hook: @for prog in $(script_DATA); do \ ! chmod +x $(DESTDIR)/$(scriptdir)/$$prog; \ done EXTRA_DIST = acinstall $(pkgdata_DATA) $(script_DATA) Index: automake/Makefile.in diff -c automake/Makefile.in:1.217.4.3 automake/Makefile.in:1.217.4.4 *** automake/Makefile.in:1.217.4.3 Tue May 8 17:40:52 2001 --- automake/Makefile.in Sun May 13 16:13:54 2001 *************** *** 569,575 **** install-data-hook: @for prog in $(script_DATA); do \ ! chmod +x $(scriptdir)/$$prog; \ done installcheck-local: --- 569,575 ---- install-data-hook: @for prog in $(script_DATA); do \ ! chmod +x $(DESTDIR)/$(scriptdir)/$$prog; \ done installcheck-local: Index: automake/NEWS diff -c automake/NEWS:1.130.4.1 automake/NEWS:1.130.4.2 *** automake/NEWS:1.130.4.1 Tue May 8 17:35:02 2001 --- automake/NEWS Thu May 24 13:35:40 2001 *************** *** 1,3 **** --- 1,9 ---- + New in 1.4-p2: + * Deal with AC_CONFIG_FILES from autoconf-2.50. + * Improvements to f77 support. + * DESTDIR now works for script targets. + * distcheck-hook works correctly. + New in 1.4-p1: * The version numbering system now allows fork identifiers (such as the p1 in this version of automake). Index: automake/automake.in diff -c automake/automake.in:1.644.4.4 automake/automake.in:1.644.4.8 *** automake/automake.in:1.644.4.4 Tue May 8 13:44:30 2001 --- automake/automake.in Thu May 24 13:35:40 2001 *************** *** 6,12 **** if 0; # automake - create Makefile.in from Makefile.am ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- 6,12 ---- if 0; # automake - create Makefile.in from Makefile.am ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by *************** *** 398,404 **** if ($arglist[0] eq "--version") { print "automake (GNU $PACKAGE) $VERSION\n\n"; ! print "Copyright (C) 1999 Free Software Foundation, Inc.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"; print "Written by Tom Tromey \n"; --- 398,404 ---- if ($arglist[0] eq "--version") { print "automake (GNU $PACKAGE) $VERSION\n\n"; ! print "Copyright (C) 1999, 2001 Free Software Foundation, Inc.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"; print "Written by Tom Tromey \n"; *************** *** 2555,2562 **** mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \\' . (&target_defined ('distcheck-hook') ! ? ("\t\$(MAKE) \$(AM_MAKEFLAGS)" ! . " distcheck-hook") : '') . ' cd $(distdir)/=build \\ --- 2555,2562 ---- mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \\' . (&target_defined ('distcheck-hook') ! ? ("\n\t\$(MAKE) \$(AM_MAKEFLAGS)" ! . " distcheck-hook; \\") : '') . ' cd $(distdir)/=build \\ *************** *** 4054,4059 **** --- 4054,4064 ---- $in_ac_output = 1; $ac_output_line = $.; } + if (! $in_ac_output && s/AC_CONFIG_FILES\s*\(\[?//) + { + $in_ac_output = 1; + $ac_output_line = $.; + } if ($in_ac_output) { local ($closing) = 0; *************** *** 4514,4519 **** --- 4519,4530 ---- return 1; } + # Rewrite a single Fortran 77 preprocessed file. + sub lang_ppf77_rewrite + { + return 1; + } + # Rewrite a single Objective C file. sub lang_objc_rewrite { *************** *** 4844,4862 **** &define_variable ('F77LD', '$(F77)'); &define_variable ('F77LINK', $ltlink . '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@'); ! $output_rules .= ("$ext.o:\n" . "\t\$(F77COMPILE) -c \$<\n"); # FIXME: Using cygpath should be somehow conditional. ! $output_rules .= ("$ext.obj:\n" . "\t\$(F77COMPILE) -c `cygpath -w \$<`\n") if ($seen_objext); ! $output_rules .= ("$ext.lo:\n" . "\t\$(LTF77COMPILE) -c \$<\n") if ($seen_libtool); # We also handle the case of preprocessing `.F' files into `.f' # files. ! $output_rules .= ("$ext.f:\n" . "\t\$(F77COMPILE) -F \$<\n"); if (! defined $configure_vars{'F77'}) --- 4855,4873 ---- &define_variable ('F77LD', '$(F77)'); &define_variable ('F77LINK', $ltlink . '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(LDFLAGS) -o $@'); ! $output_rules .= (".$ext.o:\n" . "\t\$(F77COMPILE) -c \$<\n"); # FIXME: Using cygpath should be somehow conditional. ! $output_rules .= (".$ext.obj:\n" . "\t\$(F77COMPILE) -c `cygpath -w \$<`\n") if ($seen_objext); ! $output_rules .= (".$ext.lo:\n" . "\t\$(LTF77COMPILE) -c \$<\n") if ($seen_libtool); # We also handle the case of preprocessing `.F' files into `.f' # files. ! $output_rules .= (".$ext.f:\n" . "\t\$(F77COMPILE) -F \$<\n"); if (! defined $configure_vars{'F77'}) Index: automake/config.sub diff -c automake/config.sub:1.149.8.1 automake/config.sub:1.149.8.2 *** automake/config.sub:1.149.8.1 Tue May 8 17:27:14 2001 --- automake/config.sub Thu May 24 13:20:07 2001 *************** *** 3,9 **** # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-04-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software --- 3,9 ---- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-05-24' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software *************** *** 234,240 **** | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ | v850 | c4x \ | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ ! | pj | pjl | h8500) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) --- 234,240 ---- | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ | v850 | c4x \ | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ ! | pj | pjl | h8500 | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) *************** *** 242,248 **** basic_machine=$basic_machine-unknown os=-none ;; ! m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65) ;; # We use `pc' rather than `unknown' --- 242,248 ---- basic_machine=$basic_machine-unknown os=-none ;; ! m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; # We use `pc' rather than `unknown' *************** *** 271,278 **** | alphaev6[78]-* \ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | clipper-* | orion-* \ ! | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ ! | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ | mips16-* | mips64-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ --- 271,278 ---- | alphaev6[78]-* \ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | clipper-* | orion-* \ ! | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \ ! | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ | mips16-* | mips64-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ Index: automake/configure diff -c automake/configure:1.62.4.2 automake/configure:1.62.4.4 *** automake/configure:1.62.4.2 Tue May 8 13:50:53 2001 --- automake/configure Thu May 24 13:35:41 2001 *************** *** 692,698 **** PACKAGE=automake ! VERSION=1.4-p1 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } --- 692,698 ---- PACKAGE=automake ! VERSION=1.4-p2 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } Index: automake/configure.in diff -c automake/configure.in:1.67.4.2 automake/configure.in:1.67.4.4 *** automake/configure.in:1.67.4.2 Tue May 8 13:50:53 2001 --- automake/configure.in Thu May 24 13:35:42 2001 *************** *** 1,7 **** dnl Process this file with autoconf to produce a configure script. AC_INIT(automake.in) ! AM_INIT_AUTOMAKE(automake, 1.4-p1) # Find an appropriate tar for use in "dist" targets. A "best guess" # is good enough -- if we can't find GNU tar, we don't really care. --- 1,7 ---- dnl Process this file with autoconf to produce a configure script. AC_INIT(automake.in) ! AM_INIT_AUTOMAKE(automake, 1.4-p2) # Find an appropriate tar for use in "dist" targets. A "best guess" # is good enough -- if we can't find GNU tar, we don't really care. Index: automake/stamp-vti diff -c automake/stamp-vti:1.68.4.2 automake/stamp-vti:1.68.4.4 *** automake/stamp-vti:1.68.4.2 Tue May 8 13:50:54 2001 --- automake/stamp-vti Thu May 24 13:35:42 2001 *************** *** 1,3 **** @set UPDATED 6 January 1999 ! @set EDITION 1.4-p1 ! @set VERSION 1.4-p1 --- 1,3 ---- @set UPDATED 6 January 1999 ! @set EDITION 1.4-p2 ! @set VERSION 1.4-p2 Index: automake/version.texi diff -c automake/version.texi:1.141.4.2 automake/version.texi:1.141.4.4 *** automake/version.texi:1.141.4.2 Tue May 8 13:50:54 2001 --- automake/version.texi Thu May 24 13:35:42 2001 *************** *** 1,3 **** @set UPDATED 6 January 1999 ! @set EDITION 1.4-p1 ! @set VERSION 1.4-p1 --- 1,3 ---- @set UPDATED 6 January 1999 ! @set EDITION 1.4-p2 ! @set VERSION 1.4-p2