# HG changeset patch # User Karl Berry # Date 1032963537 0 # Node ID b154fedeafdc03b90cf77769ebc201f0cd38cf34 # Parent cdfc64e8c3d8c909c39e1af88da437a895db01b5 update from automake 1.6 diff --git a/config/mdate-sh b/config/mdate-sh --- a/config/mdate-sh +++ b/config/mdate-sh @@ -1,6 +1,6 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. -# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright 1995, 1996, 1997 Free Software Foundation, Inc. # written by Ulrich Drepper , June 1995 # # This program is free software; you can redistribute it and/or modify @@ -17,6 +17,11 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + # Prevent date giving response in another language. LANG=C export LANG diff --git a/config/mkinstalldirs b/config/mkinstalldirs --- a/config/mkinstalldirs +++ b/config/mkinstalldirs @@ -4,8 +4,6 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.2 2002-06-13 09:30:02 meyering Exp $ - errstatus=0 dirmode="" diff --git a/config/srclist-update b/config/srclist-update --- a/config/srclist-update +++ b/config/srclist-update @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: srclist-update,v 1.1 2002-09-10 23:41:12 karl Exp $ +# $Id: srclist-update,v 1.2 2002-09-25 14:18:57 karl Exp $ # # Check for files being up to date, according to the list on stdin. # @@ -45,7 +45,7 @@ $verbose && echo "## $src $dst # unchanged" else echo "## $src $dst # changes" - diff -c2 $src $dst + diff -c2 $dst $src fi done diff --git a/config/srclist.txt b/config/srclist.txt --- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,11 +1,29 @@ -# $Id: srclist.txt,v 1.3 2002-09-13 20:40:39 karl Exp $ +# $Id: srclist.txt,v 1.4 2002-09-25 14:18:57 karl Exp $ # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. -$TEXINFOSRC/doc/texinfo.tex config $GNUCONFIG/config.guess config $GNUCONFIG/config.sub config -$LIBCSRC/scripts/install-sh config -$LIBCSRC/scripts/mkinstalldirs config +$AUTOMAKE/depcomp config +#$LIBCSRC/scripts/install-sh config +$AUTOMAKE/install-sh config +$AUTOMAKE/mdate-sh config +$AUTOMAKE/missing config +#$LIBCSRC/scripts/mkinstalldirs config +$AUTOMAKE/mkinstalldirs config +$TEXINFOSRC/doc/texinfo.tex config $AUTOCONF/INSTALL doc +$GNUORG/COPYING.DOC doc +$GNUORG/fdl.texi doc + +$LIBCSRC/posix/getopt.c lib +$LIBCSRC/posix/getopt.h lib +$LIBCSRC/posix/getopt1.c lib +#$GETTEXT/gettext.h lib +# - libc/sysdeps/generic has memcpy.c, memmove.c, strcasecmp.c, but they +# are totally different implementations. +# - Likewise libc/string/strerror.c. +# - libc/locale/programs/xstrdup.c is almost usable, but uses the __P +# prototype macro. +$LIBCSRC/string/strdup.c lib diff --git a/config/srclistvars.sh b/config/srclistvars.sh --- a/config/srclistvars.sh +++ b/config/srclistvars.sh @@ -1,14 +1,16 @@ -# $Id: srclistvars.sh,v 1.4 2002-09-24 15:40:12 karl Exp $ +# $Id: srclistvars.sh,v 1.5 2002-09-25 14:18:57 karl Exp $ # Variables for srclist-update and srclist.txt. -# Definitely will change for each user. +# Will change for each user. : ${ACLOCAL=/usr/local/gnu/share/aclocal} : ${AUTOCONF=/usr/local/gnu/share/autoconf} +: ${AUTOMAKE=/usr/local/gnu/share/automake-1.6} : ${EMACSSRC=$HOME/gnu/src/emacs} : ${GETTEXT=/usr/local/gnu/share/gettext} : ${GNUBIN=/usr/local/gnu/bin} : ${GNUCONFIG=$HOME/gnu/src/ftp.gnu.org/pub/gnu/config} : ${GNULIBSRC=$HOME/gnu/src/gnulib} +: ${GNUORG=$HOME/gnu/gnuorg} : ${LIBCSRC=$HOME/gnu/src/libc} : ${TEXINFOSRC=/u/texinfo/src} : ${TEXMF=/usr/local/texmf/texmf}