texinfo ChangeLog tp/maintain/regenerate_docume...

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/11/13 23:46:32

Modified files:
        .              : ChangeLog 
        tp/maintain    : regenerate_document_strings_make_rules.sh 
                         regenerate_file_lists.pl 

Log message:
        more $< removal

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1440&r2=1.1441
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/regenerate_document_strings_make_rules.sh?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/maintain/regenerate_file_lists.pl?cvsroot=texinfo&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1440
retrieving revision 1.1441
diff -u -b -r1.1440 -r1.1441
--- ChangeLog   13 Nov 2012 18:56:16 -0000      1.1440
+++ ChangeLog   13 Nov 2012 23:46:31 -0000      1.1441
@@ -1,5 +1,9 @@
 2012-11-13  Karl Berry  <address@hidden>
 
+       * tp/maintain/regenerate_file_list.pl,
+       * maintain/regenerate_document_strings_make_rules.sh: do not
+       generate rules using $<.
+
        * doc/Makefile.am (wwwdoc-build, wwwdoc-install): new targets
        for updating the manuals on the web.
        

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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/maintain/regenerate_document_strings_make_rules.sh       9 Feb 2012 
23:51:50 -0000       1.1
+++ tp/maintain/regenerate_document_strings_make_rules.sh       13 Nov 2012 
23:46:32 -0000      1.2
@@ -1,4 +1,16 @@
 #! /bin/sh
+# $Id: regenerate_document_strings_make_rules.sh,v 1.2 2012/11/13 23:46:32 
karl Exp $
+# Copyright 2011, 2012 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Originally written by Patrice Dumas.
 
 dir=`echo $0 | sed 's,/[^/]\+$,,'`
 outfile=Makefile.documents_strings_mo_files
@@ -18,19 +30,19 @@
        cd $(srcdir)/../po_document/ && $(MAKE) $(AM_MAKEFLAGS) '"$lingua.gmo"'
 
 LocaleData/'"$lingua"'/LC_MESSAGES/$(document_domain).mo: 
$(srcdir)/../po_document/'"$lingua"'.gmo LocaleData/'"$lingua"'/LC_MESSAGES
-       $(INSTALL_DATA) $< $@
+       $(INSTALL_DATA) $(srcdir)/../po_document/'"$lingua"'.gmo $@
 
 LocaleData/'"$lingua"'/LC_MESSAGES: LocaleData/'"$lingua"'
-       $(MKDIR_P) $@
+       $(mkdir_p) $@
 
 LocaleData/'"$lingua"': LocaleData
-       $(MKDIR_P) $@
+       $(mkdir_p) $@
 ' >> $outfile
   dependencies="$dependencies 
"'LocaleData/'"$lingua"'/LC_MESSAGES/$(document_domain).mo'
 done
 
 echo 'LocaleData:
-       $(MKDIR_P) $@
+       $(mkdir_p) $@
 
 document_strings_mo_files = '"$dependencies" >> $outfile
 )

Index: tp/maintain/regenerate_file_lists.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/maintain/regenerate_file_lists.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tp/maintain/regenerate_file_lists.pl        12 Sep 2012 00:40:24 -0000      
1.8
+++ tp/maintain/regenerate_file_lists.pl        13 Nov 2012 23:46:32 -0000      
1.9
@@ -1,5 +1,5 @@
 #! /usr/bin/perl -w
-#
+# $Id: regenerate_file_lists.pl,v 1.9 2012/11/13 23:46:32 karl Exp $
 # Copyright 2011, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
@@ -52,14 +52,14 @@
 print INCLUDE "\n\n";
 
 print INCLUDE "t/include_dir:\n".
-   "\t".'$(MKDIR_P) $@'."\n\n";
+   "\t".'$(mkdir_p) $@'."\n\n";
 my $test_copied_include_files = 'test_copied_include_files =';
 foreach my $include_file (keys(%include_files)) {
   my $bfile = basename($include_file);
   $test_copied_include_files .= " t/include_dir/$bfile";
 
   print INCLUDE "t/include_dir/$bfile: $include_file t/include_dir\n"
-     ."\t".'$(INSTALL_DATA) $< $@'."\n\n";
+     ."\t".'$(INSTALL_DATA) $include_file $@'."\n\n";
 }
 
 print INCLUDE $test_copied_include_files ."\n\n";