texinfo ChangeLog tp/Makefile.am tp/README tp/t...

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/11/16 18:33:03

Modified files:
        .              : ChangeLog 
        tp             : Makefile.am README 
        tp/tests       : run_parser_all.sh 
        tp/maintain    : regenerate_document_strings_make_rules.sh 

Log message:
        avoid \+ in sed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1443&r2=1.1444
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/README?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/run_parser_all.sh?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/regenerate_document_strings_make_rules.sh?cvsroot=texinfo&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1443
retrieving revision 1.1444
diff -u -b -r1.1443 -r1.1444
--- ChangeLog   16 Nov 2012 01:26:27 -0000      1.1443
+++ ChangeLog   16 Nov 2012 18:33:02 -0000      1.1444
@@ -1,3 +1,10 @@
+2012-11-16  Karl Berry  <address@hidden>
+
+       * tp/Makefile.am,
+       * tp/maintain/regenerate_document_strings_make_rules.sh,
+       * tp/tests/run_parser_all.sh: avoid \+ with sed, not
+       supported by BSD sed.
+
 2012-11-16  Patrice Dumas  <address@hidden>
 
        * configure.ac, tp/defs.in, tp/maintain/all_tests.sh, 
@@ -11,6 +18,12 @@
 
 2012-11-13  Karl Berry  <address@hidden>
 
+       * configure.ac (PERL): check for it up front.
+       Will anyone want to build Texinfo without makeinfo?  We'll see.
+       
+       * doc/Makefile.am (EXTRA_DIST): missed \ at end of variable list.
+       Why wasn't this an error with GNU make?  Didn't investigate.
+
        * tp/maintain/regenerate_file_list.pl,
        * tp/maintain/regenerate_document_strings_make_rules.sh: do not
        generate rules using $<.

Index: tp/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- tp/Makefile.am      11 Nov 2012 19:53:19 -0000      1.48
+++ tp/Makefile.am      16 Nov 2012 18:33:03 -0000      1.49
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.48 2012/11/11 19:53:19 pertusus Exp $
+# $Id: Makefile.am,v 1.49 2012/11/16 18:33:03 karl Exp $
 # Makefile.am for texinfo/tp.
 #
 # Copyright 2011, 2012 Free Software Foundation, Inc.
@@ -162,7 +162,7 @@
 TESTS = $(tp_tests)
 endif
 
-maintainance_files = \
+maintenance_files = \
   maintain/all_tests.sh \
   maintain/change_perl_modules_version.sh \
   maintain/language-subtag-registry \
@@ -187,17 +187,19 @@
   $(test_files_generated_list) \
   $(test_files) \
   $(tp_tests) \
-  $(maintainance_files) \
+  $(maintenance_files) \
   $(perl_specific_files) \
   maintain/lib
 
 MANIFEST: maintain/MANIFEST_generated_files Makefile.am Makefile.tres
        LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE; \
-       echo "$(dist_modules_DATA) $(dist_converters_DATA) 
$(dist_debugmodules_DATA) " \
-       "$(dist_init_DATA) $(test_files) $(tp_tests) 
$(test_files_generated_list) " \
-       "texi2any $(maintainance_files) README TODO COPYING " \
-       "$(perl_specific_files)" \
-        | sed 's/ \+/\n/g' | cat - $(srcdir)/maintain/MANIFEST_generated_files 
\
+       echo "$(dist_modules_DATA) $(dist_converters_DATA)" \
+       "$(dist_debugmodules_DATA) $(dist_init_DATA)" \
+       "$(test_files) $(tp_tests) $(test_files_generated_list)" \
+       "texi2any README TODO COPYING" \
+       "$(maintenance_files) $(perl_specific_files)" \
+        | sed 's/  */\n/g' \
+        | cat - $(srcdir)/maintain/MANIFEST_generated_files \
         | sort >$@
 
 maintain/catalog.xml: maintain/catalog.xml.in Makefile
@@ -235,7 +237,6 @@
 uninstall-local:
        rm -rf $(DESTDIR)$(pkgdatadir)/lib/
 
-
 distclean-local:
        rm -rf LocaleData
        rm -f t/results/*/*.pl.new

Index: tp/README
===================================================================
RCS file: /sources/texinfo/texinfo/tp/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tp/README   23 Feb 2012 22:14:42 -0000      1.8
+++ tp/README   16 Nov 2012 18:33:03 -0000      1.9
@@ -1,4 +1,4 @@
-$Id: README,v 1.8 2012/02/23 22:14:42 pertusus Exp $
+$Id: README,v 1.9 2012/11/16 18:33:03 karl Exp $
 texinfo/tp/README
 
   Copyright 2011, 2012 Free Software Foundation, Inc.
@@ -23,11 +23,11 @@
 To run the tests you also need:
   Data::Compare, Test::Deep
 On Debian-based distros, the corresponding packages are named:
-libdata-compare-perl libtest-deep-perl
+  libdata-compare-perl libtest-deep-perl
 
 
 This module is part of GNU Texinfo.  A standalone Perl module may also be
 produced from within the the Texinfo tree, using 
   ./maintain/prepare_perl_module.sh
 The resulting module, although standalone, should always be regenerated
-from the sources in texinfo, to avoid divergence of sources.
+from the sources in Texinfo, to avoid divergence of sources.

Index: tp/tests/run_parser_all.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/run_parser_all.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tp/tests/run_parser_all.sh  16 Nov 2012 01:26:28 -0000      1.10
+++ tp/tests/run_parser_all.sh  16 Nov 2012 18:33:03 -0000      1.11
@@ -118,7 +118,7 @@
 # there are better ways
     dir=`echo $line | awk '{print $1}'`
     file=`echo $line | awk '{print $2}'`
-    remaining=`echo $line | sed 's/[a-zA-Z0-9_./-]\+ \+[a-zA-Z0-9_./-]\+ *//'`
+    remaining=`echo $line | sed 's/[a-zA-Z0-9_./-]* *[a-zA-Z0-9_./-]* *//'`
     [ "z$dir" = 'z' -o "$zfile" = 'z' ] && continue
     basename=`basename $file .texi`
     if [ "z$dir" = 'ztexi' ]; then
@@ -188,7 +188,8 @@
   file=`echo $line | awk '{print $2}'`
   [ "z$current" = 'z' -o "$zfile" = 'z' ] && continue
   basename=`basename $file .texi`
-  remaining=`echo $line | sed 's/[a-zA-Z0-9_./-]\+ \+[a-zA-Z0-9_./-]\+ *//' | 
sed 's,@PATH_SEPARATOR@,'"${PATH_SEPARATOR}$testdir/$srcdir_test/"',g'`
+  remaining=`echo $line | sed 's/[a-zA-Z0-9_./-]* *[a-zA-Z0-9_./-]* *//' \
+      | sed 's,@PATH_SEPARATOR@,'"${PATH_SEPARATOR}$testdir/$srcdir_test/"',g'`
   src_file="$testdir/$srcdir_test/$file"
   if [ $one_test = 'yes' -a "z$current" != "z$the_test" ]; then
     continue

Index: tp/maintain/regenerate_document_strings_make_rules.sh
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/maintain/regenerate_document_strings_make_rules.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tp/maintain/regenerate_document_strings_make_rules.sh       13 Nov 2012 
23:46:32 -0000      1.2
+++ tp/maintain/regenerate_document_strings_make_rules.sh       16 Nov 2012 
18:33:03 -0000      1.3
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: regenerate_document_strings_make_rules.sh,v 1.2 2012/11/13 23:46:32 
karl Exp $
+# $Id: regenerate_document_strings_make_rules.sh,v 1.3 2012/11/16 18:33:03 
karl Exp $
 # Copyright 2011, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
@@ -12,7 +12,7 @@
 #
 # Originally written by Patrice Dumas.
 
-dir=`echo $0 | sed 's,/[^/]\+$,,'`
+dir=`echo $0 | sed 's,/[^/]*$,,'`
 outfile=Makefile.documents_strings_mo_files
 
 (