texinfo ChangeLog Pod-Simple-Texinfo/Makefile.a...

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/11/11 00:44:37

Modified files:
        .              : ChangeLog 
        Pod-Simple-Texinfo: Makefile.am 
        texi2html      : Makefile.am 
        tp             : Makefile.am 
        tp/tests       : Makefile.am 
        util           : Makefile.am 

Log message:
        avoid $< in non-suffix rules

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1435&r2=1.1436
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/Makefile.am?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/Makefile.am?cvsroot=texinfo&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/Makefile.am?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/Makefile.am?cvsroot=texinfo&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1435
retrieving revision 1.1436
diff -u -b -r1.1435 -r1.1436
--- ChangeLog   11 Nov 2012 00:33:53 -0000      1.1435
+++ ChangeLog   11 Nov 2012 00:44:36 -0000      1.1436
@@ -1,5 +1,8 @@
 2012-11-10  Karl Berry  <address@hidden>
 
+       * */Makefile.am: laboriously+manually+redundantly expand $< in
+       non-suffix rule.
+
        * install-info/tests/defs.in: set CDPATH before unsetting,
        to placate BSD sh.  From Stefano.
        * install-info/tests/ii-0053-test: avoid -e.

Index: Pod-Simple-Texinfo/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Pod-Simple-Texinfo/Makefile.am      24 Jan 2012 22:50:13 -0000      1.4
+++ Pod-Simple-Texinfo/Makefile.am      11 Nov 2012 00:44:36 -0000      1.5
@@ -1,3 +1,15 @@
+# $Id: Makefile.am,v 1.5 2012/11/11 00:44:36 karl Exp $
+# Makefile.am for texinfo/Pod-Simple_Texinfo.
+# Copyright 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.
+
 nodist_bin_SCRIPTS = pod2texi
 
 EXTRA_DIST = Changes \
@@ -14,7 +26,7 @@
 
 pod2texi: pod2texi.pl Makefile
        sed -e 's,address@hidden@],$(datadir),g' \
-       -e 's,address@hidden@],$(PACKAGE),g' $(srcdir)/$< >$@
+       -e 's,address@hidden@],$(PACKAGE),g' $(srcdir)/pod2texi.pl >$@
        chmod a+x $@
 
 TESTS = prove.sh

Index: texi2html/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/Makefile.am,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- texi2html/Makefile.am       9 Nov 2012 16:36:13 -0000       1.86
+++ texi2html/Makefile.am       11 Nov 2012 00:44:36 -0000      1.87
@@ -179,7 +179,7 @@
 texi2html.spec: texi2html.spec.in $(top_builddir)/configure
        @echo Generating address@hidden
        @sed -e "s/address@hidden@]/$(PACKAGE_VERSION)/" \
-            $< >texi2html.tmp
+           texi2html.spec.in >texi2html.tmp
        @cp texi2html.tmp texi2html.spec
        address@hidden texi2html.tmp
 
@@ -194,14 +194,20 @@
 # autogenerated with charset CHARSET (and no command line option for 
 # xgettext to change it), and msgexec doesn't like it and don't do anything.
 # msgexec: present charset "CHARSET" is not a portable encoding name
+# (Actually we write out the value of $<, but that's what it is.)
 i18n/en.thl i18n/: $(po_document_dir)/po_document/$(PACKAGE)_document.pot
        $(mkdir_p) i18n
        if test '$(USE_NLS)' = 'yes'; then \
-         for file in "$(srcdir)/$(po_document_dir)/po_document/"*".po"; do 
lang=`basename "$$file" .po | sed 's/\..*//'`; \
+         for file in "$(srcdir)/$(po_document_dir)/po_document/"*".po"; do \
+           lang=`basename "$$file" .po | sed 's/\..*//'`; \
                test "$$lang" = 'en' && continue; \
-               msgexec -i "$$file" "$(srcdir)/gettext_to_separated.pl" | 
"$(srcdir)/separated_to_hash.pl" $$lang > i18n/$$lang.thl; \
+           msgexec -i "$$file" "$(srcdir)/gettext_to_separated.pl" \
+           | "$(srcdir)/separated_to_hash.pl" $$lang > i18n/$$lang.thl; \
          done; \
-         cat $< | sed -e 's/charset=CHARSET/charset=ascii/' | msgexec 
"$(srcdir)/gettext_to_separated.pl" | "$(srcdir)/separated_to_hash.pl" en > 
i18n/en.thl; \
+         cat $(po_document_dir)/po_document/$(PACKAGE)_document.pot \
+         | sed -e 's/charset=CHARSET/charset=ascii/' \
+         | msgexec "$(srcdir)/gettext_to_separated.pl" \
+         | "$(srcdir)/separated_to_hash.pl" en >i18n/en.thl; \
        else \
          cp -p "$(srcdir)/i18n_ref/"*.thl i18n; \
        fi
@@ -216,10 +222,6 @@
          cp -p i18n/*.thl i18n_ref; \
        fi
 
-#i18n/en: $(po_document_dir)/po_document/$(PACKAGE)_document.pot
-#      $(mkdir_p) i18n
-#      msgexec -i $< "$(srcdir)/gettext_to_separated.pl" | 
"$(srcdir)/separated_to_hash.pl" en > $@
-
 translations.pl: i18n/en.thl
        $(PERL) manage_i18n.pl -d i18n -o $@ -I . -I $(srcdir) merge
 

Index: tp/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- tp/Makefile.am      9 Nov 2012 16:36:13 -0000       1.46
+++ tp/Makefile.am      11 Nov 2012 00:44:37 -0000      1.47
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.46 2012/11/09 16:36:13 karl Exp $
+# $Id: Makefile.am,v 1.47 2012/11/11 00:44:37 karl Exp $
 # Makefile.am for texinfo/tp.
 #
 # Copyright 2011, 2012 Free Software Foundation, Inc.
@@ -44,7 +44,7 @@
   -e 's,address@hidden@],$(USE_EXTERNAL_UNIDECODE),g'
 
 texi2any: texi2any.pl $(top_builddir)/config.status
-       $(do_subst) $(srcdir)/$< >$@
+       $(do_subst) $(srcdir)/texi2any.pl >$@
        chmod a+x $@
 
 makeinfo: texi2any
@@ -197,11 +197,13 @@
        "$(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 - $< | sort > $@
+        | sed 's/ \+/\n/g' | cat - maintain/MANIFEST_generated_files \
+        | sort >$@
 
 maintain/catalog.xml: maintain/catalog.xml.in Makefile
        $(mkdir_p) maintain
-       sed -e 's|address@hidden@]|$(abs_top_srcdir)|' $< > $@
+       sed -e 's|address@hidden@]|$(abs_top_srcdir)|' \
+         maintain/catalog.xml.in >$@
 
 
 libsrcdir = $(srcdir)/maintain/lib

Index: tp/tests/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tp/tests/Makefile.am        25 Sep 2012 17:46:38 -0000      1.9
+++ tp/tests/Makefile.am        11 Nov 2012 00:44:37 -0000      1.10
@@ -1,6 +1,6 @@
+# $Id: Makefile.am,v 1.10 2012/11/11 00:44:37 karl Exp $
 # Makefile.am for texinfo/tp/tests.
-#
-# Copyright 2012 # Free Software Foundation, Inc.
+# Copyright 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
@@ -55,23 +55,23 @@
  sectioning/equivalent_nodes-noderename.cnf
 
 htmlxref/htmlxref.cnf: htmlxref/htmlxref.cnf-ref
-       ${INSTALL_DATA} $< $@
+       ${INSTALL_DATA} htmlxref/htmlxref.cnf-ref $@
 
 htmlxref-only_mono/htmlxref.cnf: htmlxref-only_mono/htmlxref.cnf-ref
-       ${INSTALL_DATA} $< $@
+       ${INSTALL_DATA} htmlxref-only_mono/htmlxref.cnf-ref $@
 
 htmlxref-only_split/htmlxref.cnf: htmlxref-only_split/htmlxref.cnf-ref
-       ${INSTALL_DATA} $< $@
+       ${INSTALL_DATA} htmlxref-only_split/htmlxref.cnf-ref $@
 
 htmlxref-only_split/.texinfo/htmlxref.cnf: \
  htmlxref-only_split/htmlxref.cnf-texinfo htmlxref-only_split/.texinfo
-       ${INSTALL_DATA} $< $@
+       ${INSTALL_DATA} htmlxref-only_split/htmlxref.cnf-texinfo $@
 
 htmlxref-only_split/.texinfo:
        $(mkdir_p) $@
 
 sectioning/equivalent_nodes-noderename.cnf: sectioning/renamednodes.cnf-ref
-       ${INSTALL_DATA} $< $@
+       ${INSTALL_DATA} sectioning/renamednodes.cnf-ref $@
 
 EXTRA_DIST = run_parser_all.sh parser_tests.sh \
  $(TESTS) coverage_macro.texi

Index: util/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- util/Makefile.am    9 Sep 2012 22:46:00 -0000       1.46
+++ util/Makefile.am    11 Nov 2012 00:44:37 -0000      1.47
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.46 2012/09/09 22:46:00 pertusus Exp $
+# $Id: Makefile.am,v 1.47 2012/11/11 00:44:37 karl Exp $
 # Makefile.am for texinfo/util.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -23,7 +23,7 @@
 
 txixml2texi: txixml2texi.pl Makefile
        sed -e 's,address@hidden@],$(datadir),g' \
-       -e 's,address@hidden@],$(PACKAGE),g' $(srcdir)/$< >$@
+           -e 's,address@hidden@],$(PACKAGE),g' $(srcdir)/txixml2texi.pl >$@
        chmod a+x $@
 
 localedir = $(datadir)/locale