texinfo/texi2html Makefile.am Makefile.in test/...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/06/25 22:20:56

Modified files:
        texi2html      : Makefile.am Makefile.in 
        texi2html/test : Makefile.am Makefile.in 

Log message:
        Ship separated_to_hash.pl.
        Use automatic make variables for out of source builds.
        Install htmlxref.cnf in test directories with th eright permissions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/Makefile.am?cvsroot=texinfo&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/Makefile.in?cvsroot=texinfo&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/Makefile.am?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/Makefile.in?cvsroot=texinfo&r1=1.26&r2=1.27

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/Makefile.am,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- Makefile.am 25 Jun 2010 17:21:35 -0000      1.68
+++ Makefile.am 25 Jun 2010 22:20:45 -0000      1.69
@@ -59,7 +59,7 @@
 texi2html_sources = texi2html_configured.pl $(texi2html_additional_scripts)
 
 noinst_SCRIPTS = manage_i18n.pl buildt2h.sh addformats.sh \
- parse_8bit_makeinfo_maps.pl gettext_to_separated.pl
+ parse_8bit_makeinfo_maps.pl gettext_to_separated.pl separated_to_hash.pl
 
 # style_example.css comes from http://planet.gnu.org/~ams/style.css
 EXTRA_DIST = \
@@ -180,10 +180,10 @@
        images/xy_up_gr.png
 
 texi2html.temp: $(texi2html_sources)
-       $(SHELL) $(srcdir)/buildt2h.sh $@ $(texi2html_sources)
+       $(SHELL) $(srcdir)/buildt2h.sh $@ $^
 
 texi2html: texi2html.temp $(texi2html_formats)
-       $(SHELL) $(srcdir)/addformats.sh $@ $(texi2html_formats)
+       $(SHELL) $(srcdir)/addformats.sh $@ $^
        chmod a+x $@
 
 texi2html.spec: texi2html.spec.in $(top_builddir)/configure

Index: Makefile.in
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/Makefile.in,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- Makefile.in 25 Jun 2010 17:21:39 -0000      1.98
+++ Makefile.in 25 Jun 2010 22:20:51 -0000      1.99
@@ -53,9 +53,9 @@
 DIST_COMMON = README $(dist_i18n_DATA) $(dist_images_DATA) \
        $(dist_init_DATA) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(srcdir)/check_texinfo.pl.in $(srcdir)/manage_i18n.pl.in \
-       $(srcdir)/texi2html.pl AUTHORS COPYING ChangeLog INSTALL NEWS \
-       TODO config.guess config.rpath config.sub install-sh mdate-sh \
-       missing mkinstalldirs
+       $(srcdir)/texi2html.pl ABOUT-NLS AUTHORS COPYING ChangeLog \
+       INSTALL NEWS TODO config.guess config.rpath config.sub \
+       install-sh mdate-sh missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \
        $(top_srcdir)/gnulib/m4/alloca.m4 \
@@ -774,7 +774,7 @@
 
 texi2html_sources = texi2html_configured.pl $(texi2html_additional_scripts)
 noinst_SCRIPTS = manage_i18n.pl buildt2h.sh addformats.sh \
- parse_8bit_makeinfo_maps.pl gettext_to_separated.pl
+ parse_8bit_makeinfo_maps.pl gettext_to_separated.pl separated_to_hash.pl
 
 
 # style_example.css comes from http://planet.gnu.org/~ams/style.css
@@ -1359,10 +1359,10 @@
 
 
 texi2html.temp: $(texi2html_sources)
-       $(SHELL) $(srcdir)/buildt2h.sh $@ $(texi2html_sources)
+       $(SHELL) $(srcdir)/buildt2h.sh $@ $^
 
 texi2html: texi2html.temp $(texi2html_formats)
-       $(SHELL) $(srcdir)/addformats.sh $@ $(texi2html_formats)
+       $(SHELL) $(srcdir)/addformats.sh $@ $^
        chmod a+x $@
 
 texi2html.spec: texi2html.spec.in $(top_builddir)/configure

Index: test/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/Makefile.am    24 Jun 2010 13:19:34 -0000      1.11
+++ test/Makefile.am    25 Jun 2010 22:20:55 -0000      1.12
@@ -57,7 +57,7 @@
 all-local:
        for dir in $(htmlxref_cnf_tests); do \
                $(mkdir_p) $$dir/.texinfo/ ; \
-               cp $(srcdir)/$$dir/htmlxref.cnf $$dir/.texinfo/ ; \
+               ${INSTALL_DATA} $(srcdir)/$$dir/htmlxref.cnf $$dir/.texinfo/ ; \
        done
 
 clean-local:

Index: test/Makefile.in
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/Makefile.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- test/Makefile.in    24 Jun 2010 13:19:34 -0000      1.26
+++ test/Makefile.in    25 Jun 2010 22:20:55 -0000      1.27
@@ -1182,7 +1182,7 @@
 all-local:
        for dir in $(htmlxref_cnf_tests); do \
                $(mkdir_p) $$dir/.texinfo/ ; \
-               cp $(srcdir)/$$dir/htmlxref.cnf $$dir/.texinfo/ ; \
+               ${INSTALL_DATA} $(srcdir)/$$dir/htmlxref.cnf $$dir/.texinfo/ ; \
        done
 
 clean-local: