texinfo update (Wed Dec 15 10:22:01 EST 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.432
retrieving revision 1.434
diff -c -r1.432 -r1.434
*** ChangeLog   14 Dec 2004 17:21:53 -0000      1.432
--- ChangeLog   15 Dec 2004 15:12:58 -0000      1.434
***************
*** 1,3 ****
--- 1,14 ----
+ 2004-12-15  Juan M. Guerrero  <address@hidden>
+ 
+       * djgpp/config.sed: adjust for new autoconf.
+       * makeinfo/node.c (enumerate_filename): make dos_file_names const
+       instead of static, since it may involve a fn call to pathconf.
+ 
+ 2004-12-15  Karl Berry  <address@hidden>
+ 
+       * Makefile.am (EXTRA_DIST): include ChangeLog.46, README.dev,
+       and po/Makevars.template.  From Stepan.
+ 
  2004-12-14  Karl Berry  <address@hidden>
  
        * doc/texinfo.txi (inforef): try to explain possible uses more
Index: Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** Makefile.am 8 Oct 2004 22:01:14 -0000       1.11
--- Makefile.am 15 Dec 2004 15:03:12 -0000      1.12
***************
*** 1,5 ****
  # Makefile.am for texinfo.
! # $Id: Makefile.am,v 1.11 2004/10/08 22:01:14 karl Exp $
  # Process this file with automake to produce Makefile.in in all directories.
  #
  # This file is free software; as a special exception the author gives
--- 1,5 ----
  # Makefile.am for texinfo.
! # $Id: Makefile.am,v 1.12 2004/12/15 15:03:12 karl Exp $
  # Process this file with automake to produce Makefile.in in all directories.
  #
  # This file is free software; as a special exception the author gives
***************
*** 14,21 ****
  AUTOMAKE_OPTIONS = 1.8 readme-alpha
  
  # Additional files to distribute.
! EXTRA_DIST = INSTALL.generic INTRODUCTION config.rpath \
!   djgpp/README djgpp/config.bat djgpp/config.sed djgpp/config.site
  
  # This is to prevent texinfo.tex from being included in the top-level
  # distribution directory.
--- 14,23 ----
  AUTOMAKE_OPTIONS = 1.8 readme-alpha
  
  # Additional files to distribute.
! EXTRA_DIST = ChangeLog.46 INSTALL.generic INTRODUCTION README.dev \
!   config.rpath \
!   djgpp/README djgpp/config.bat djgpp/config.sed djgpp/config.site \
!   po/Makevars.template
  
  # This is to prevent texinfo.tex from being included in the top-level
  # distribution directory.
Index: djgpp/config.sed
===================================================================
RCS file: /cvsroot/texinfo/texinfo/djgpp/config.sed,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** djgpp/config.sed    26 Sep 2002 22:01:10 -0000      1.1
--- djgpp/config.sed    15 Dec 2004 15:12:58 -0000      1.2
***************
*** 22,28 ****
    }
  
  # Makefile.in.in is renamed to Makefile.in-in.
! /^ac_config_files=/,/_ACEOF/ {
    s|po/Makefile\.in|&:po/Makefile.in-in|
  }
  /CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2
--- 22,28 ----
    }
  
  # Makefile.in.in is renamed to Makefile.in-in.
! /ac_config_files=/,/_ACEOF/ {
    s|po/Makefile\.in|&:po/Makefile.in-in|
  }
  /CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2
***************
*** 51,60 ****
  # the package has not been configured for.
  /MISSING=/,/^$/ {
    /^fi$/ a\
! am_missing_run=`echo "$am_missing_run" | sed 
's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
  }
  /^install_sh=/a\
! install_sh=`echo "$install_sh" | sed 
's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
  
  # The following makes sure we are not going to remove a directory
  # which is the cwd on its drive (DOS doesn't allow to remove such
--- 51,60 ----
  # the package has not been configured for.
  /MISSING=/,/^$/ {
    /^fi$/ a\
! am_missing_run=`echo "$am_missing_run" | sed 
's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
  }
  /^install_sh=/a\
! install_sh=`echo "$install_sh" | sed 
's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
  
  # The following makes sure we are not going to remove a directory
  # which is the cwd on its drive (DOS doesn't allow to remove such
Index: makeinfo/node.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/node.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** makeinfo/node.c     30 Nov 2004 13:26:50 -0000      1.25
--- makeinfo/node.c     15 Dec 2004 15:12:58 -0000      1.26
***************
*** 1,5 ****
  /* node.c -- nodes for Texinfo.
!    $Id: node.c,v 1.25 2004/11/30 13:26:50 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* node.c -- nodes for Texinfo.
!    $Id: node.c,v 1.26 2004/12/15 15:12:58 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
***************
*** 1666,1672 ****
  enumerate_filename (char *pathname, char *basename, int number)
  {
    /* Do we need to generate names of subfiles which don't exceed 8+3 limits? 
*/
!   static const int dos_file_names = !HAVE_LONG_FILENAMES (pathname ? pathname 
: ".");
    unsigned name_len = strlen (basename);
    char *filename = xmalloc (10 + strlen (pathname) + name_len);
    char *base_filename = xmalloc (10 + name_len);
--- 1666,1672 ----
  enumerate_filename (char *pathname, char *basename, int number)
  {
    /* Do we need to generate names of subfiles which don't exceed 8+3 limits? 
*/
!   const int dos_file_names = !HAVE_LONG_FILENAMES (pathname ? pathname : ".");
    unsigned name_len = strlen (basename);
    char *filename = xmalloc (10 + strlen (pathname) + name_len);
    char *base_filename = xmalloc (10 + name_len);
P ChangeLog
P Makefile.am
P djgpp/config.sed
P makeinfo/node.c