Fix multi-file installation for files in srcdir.

For files that can live in the build tree or the source tree,
we have to expect that prepending `$(srcdir)/' to each name
will let the install command line exceed length limitations.
Thus use a new macro, $(am__base_list), to install in chunks
of 40 files, similar to what we do for nobase_* files.  There,
lower the limit to 40, too.

* lib/am/inst-vars.am (am__install_max): Lower to 40.
(am__base_list): New macro.
* lib/am/data.am (install-%DIR%%PRIMARY%) [%?BASE%]: Use it.
* lib/am/texinfos.am (install-dvi-am, install-html-am)
(install-info-am, install-pdf-am, install-ps-am): Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 5a61eee..2f0f54e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2008-09-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix multi-file installation for files in srcdir.
+       For files that can live in the build tree or the source tree,
+       we have to expect that prepending `$(srcdir)/' to each name
+       will let the install command line exceed length limitations.
+       Thus use a new macro, $(am__base_list), to install in chunks
+       of 40 files, similar to what we do for nobase_* files.  There,
+       lower the limit to 40, too.
+       * lib/am/inst-vars.am (am__install_max): Lower to 40.
+       (am__base_list): New macro.
+       * lib/am/data.am (install-%DIR%%PRIMARY%) [%?BASE%]: Use it.
+       * lib/am/texinfos.am (install-dvi-am, install-html-am)
+       (install-info-am, install-pdf-am, install-ps-am): Likewise.
+
+2008-09-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
        Use `Exit' instead of `exit' in test suite.
        Cater to Bourne shells like Solaris sh that do not pass the
        `exit' argument as status to the cleanup trap.

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9df28b3..5f8bd59 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -73,7 +73,7 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 50
+am__install_max = 40
 am__nobase_list = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
   for p in $$list; do echo "$$p $$p"; done | \
@@ -82,6 +82,9 @@ am__nobase_list = \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir " " files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 dist_docDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_doc_DATA) $(dist_noinst_DATA)
 ETAGS = etags
@@ -397,13 +400,13 @@ maintainer-clean-aminfo:
 install-dist_docDATA: $(dist_doc_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-       @list='$(dist_doc_DATA)'; list2=; for p in $$list; do \
+       @list='$(dist_doc_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(dist_docDATA_INSTALL) $$list2 '$(DESTDIR)$(docdir)'"; \
-         $(dist_docDATA_INSTALL) $$list2 "$(DESTDIR)$(docdir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(dist_docDATA_INSTALL) $$files '$(DESTDIR)$(docdir)'"; \
+         $(dist_docDATA_INSTALL) $$files "$(DESTDIR)$(docdir)"; done
 
 uninstall-dist_docDATA:
        @$(NORMAL_UNINSTALL)
@@ -553,13 +556,13 @@ install-dvi: install-dvi-am
 install-dvi-am: $(DVIS)
        @$(NORMAL_INSTALL)
        test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
-       @list='$(DVIS)'; list2=; for p in $$list; do \
+       @list='$(DVIS)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(dvidir)'"; \
-         $(INSTALL_DATA) $$list2 "$(DESTDIR)$(dvidir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)"; done
 install-exec-am:
 
 install-html: install-html-am
@@ -579,16 +582,17 @@ install-html-am: $(HTMLS)
            list2="$$list2 $$d$$p"; \
          fi; \
        done; \
-       test -z "$$list2" || { \
-           echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(htmldir)'"; \
-           $(INSTALL_DATA) $$list2 "$(DESTDIR)$(htmldir)"; }
+       test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)"; done; }
 install-info: install-info-am
 
 install-info-am: $(INFO_DEPS)
        @$(NORMAL_INSTALL)
        test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       list='$(INFO_DEPS)'; list2=; \
+       list='$(INFO_DEPS)'; \
        for file in $$list; do \
          case $$file in \
            $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
@@ -598,13 +602,13 @@ install-info-am: $(INFO_DEPS)
          for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
                        $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
            if test -f $$ifile; then \
-             list2="$$list2 $$ifile"; \
+             echo "$$ifile"; \
            else : ; fi; \
          done; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(infodir)'"; \
-         $(INSTALL_DATA) $$list2 "$(DESTDIR)$(infodir)"; }
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)"; done
        @$(POST_INSTALL)
        @if (install-info --version && \
             install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
@@ -622,25 +626,25 @@ install-pdf: install-pdf-am
 install-pdf-am: $(PDFS)
        @$(NORMAL_INSTALL)
        test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
-       @list='$(PDFS)'; list2=; for p in $$list; do \
+       @list='$(PDFS)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(pdfdir)'"; \
-         $(INSTALL_DATA) $$list2 "$(DESTDIR)$(pdfdir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)"; done
 install-ps: install-ps-am
 
 install-ps-am: $(PSS)
        @$(NORMAL_INSTALL)
        test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
-       @list='$(PSS)'; list2=; for p in $$list; do \
+       @list='$(PSS)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(psdir)'"; \
-         $(INSTALL_DATA) $$list2 "$(DESTDIR)$(psdir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)"; done
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index eac37ee..ef6df71 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -64,7 +64,7 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 50
+am__install_max = 40
 am__nobase_list = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
   for p in $$list; do echo "$$p $$p"; done | \
@@ -73,6 +73,9 @@ am__nobase_list = \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir " " files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(perllibdir)"
 dist_perllibDATA_INSTALL = $(INSTALL_DATA)
 nodist_perllibDATA_INSTALL = $(INSTALL_DATA)
@@ -266,13 +269,13 @@ $(am__aclocal_m4_deps):
 install-dist_perllibDATA: $(dist_perllib_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)"
-       @list='$(dist_perllib_DATA)'; list2=; for p in $$list; do \
+       @list='$(dist_perllib_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(dist_perllibDATA_INSTALL) $$list2 '$(DESTDIR)$(perllibdir)'"; \
-         $(dist_perllibDATA_INSTALL) $$list2 "$(DESTDIR)$(perllibdir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(dist_perllibDATA_INSTALL) $$files '$(DESTDIR)$(perllibdir)'"; \
+         $(dist_perllibDATA_INSTALL) $$files "$(DESTDIR)$(perllibdir)"; done
 
 uninstall-dist_perllibDATA:
        @$(NORMAL_UNINSTALL)
@@ -284,13 +287,13 @@ uninstall-dist_perllibDATA:
 install-nodist_perllibDATA: $(nodist_perllib_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)"
-       @list='$(nodist_perllib_DATA)'; list2=; for p in $$list; do \
+       @list='$(nodist_perllib_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(nodist_perllibDATA_INSTALL) $$list2 '$(DESTDIR)$(perllibdir)'"; \
-         $(nodist_perllibDATA_INSTALL) $$list2 "$(DESTDIR)$(perllibdir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(nodist_perllibDATA_INSTALL) $$files '$(DESTDIR)$(perllibdir)'"; \
+         $(nodist_perllibDATA_INSTALL) $$files "$(DESTDIR)$(perllibdir)"; done
 
 uninstall-nodist_perllibDATA:
        @$(NORMAL_UNINSTALL)

diff --git a/lib/Makefile.in b/lib/Makefile.in
index ae035cb..abfb4ec 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -67,7 +67,7 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 50
+am__install_max = 40
 am__nobase_list = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
   for p in $$list; do echo "$$p $$p"; done | \
@@ -76,6 +76,9 @@ am__nobase_list = \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir " " files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pkgvdatadir)" "$(DESTDIR)$(scriptdir)"
 dist_pkgvdataDATA_INSTALL = $(INSTALL_DATA)
 dist_scriptDATA_INSTALL = $(INSTALL_DATA)
@@ -242,13 +245,13 @@ $(am__aclocal_m4_deps):
 install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(pkgvdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgvdatadir)"
-       @list='$(dist_pkgvdata_DATA)'; list2=; for p in $$list; do \
+       @list='$(dist_pkgvdata_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(dist_pkgvdataDATA_INSTALL) $$list2 '$(DESTDIR)$(pkgvdatadir)'"; \
-         $(dist_pkgvdataDATA_INSTALL) $$list2 "$(DESTDIR)$(pkgvdatadir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(dist_pkgvdataDATA_INSTALL) $$files '$(DESTDIR)$(pkgvdatadir)'"; \
+         $(dist_pkgvdataDATA_INSTALL) $$files "$(DESTDIR)$(pkgvdatadir)"; done
 
 uninstall-dist_pkgvdataDATA:
        @$(NORMAL_UNINSTALL)
@@ -260,13 +263,13 @@ uninstall-dist_pkgvdataDATA:
 install-dist_scriptDATA: $(dist_script_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(scriptdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptdir)"
-       @list='$(dist_script_DATA)'; list2=; for p in $$list; do \
+       @list='$(dist_script_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(dist_scriptDATA_INSTALL) $$list2 '$(DESTDIR)$(scriptdir)'"; \
-         $(dist_scriptDATA_INSTALL) $$list2 "$(DESTDIR)$(scriptdir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(dist_scriptDATA_INSTALL) $$files '$(DESTDIR)$(scriptdir)'"; \
+         $(dist_scriptDATA_INSTALL) $$files "$(DESTDIR)$(scriptdir)"; done
 
 uninstall-dist_scriptDATA:
        @$(NORMAL_UNINSTALL)

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index d30c8d1..7188542 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -57,7 +57,7 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 50
+am__install_max = 40
 am__nobase_list = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
   for p in $$list; do echo "$$p $$p"; done | \
@@ -66,6 +66,9 @@ am__nobase_list = \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir " " files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(amdir)"
 dist_amDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_am_DATA)
@@ -233,13 +236,13 @@ $(am__aclocal_m4_deps):
 install-dist_amDATA: $(dist_am_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(amdir)" || $(MKDIR_P) "$(DESTDIR)$(amdir)"
-       @list='$(dist_am_DATA)'; list2=; for p in $$list; do \
+       @list='$(dist_am_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(dist_amDATA_INSTALL) $$list2 '$(DESTDIR)$(amdir)'"; \
-         $(dist_amDATA_INSTALL) $$list2 "$(DESTDIR)$(amdir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(dist_amDATA_INSTALL) $$files '$(DESTDIR)$(amdir)'"; \
+         $(dist_amDATA_INSTALL) $$files "$(DESTDIR)$(amdir)"; done
 
 uninstall-dist_amDATA:
        @$(NORMAL_UNINSTALL)

diff --git a/lib/am/data.am b/lib/am/data.am
index 627301b..3536f94 100644 (file)
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -33,17 +33,17 @@ install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%)
 if %?BASE%
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-       @list='$(%DIR%_%PRIMARY%)'; list2=; for p in $$list; do \
+       @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
 ## A file can be in the source directory or the build directory.
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 ## If the _%PRIMARY% variable has an entry like foo/bar, install it as
 ## $(destdir)/bar, not $(destdir)/foo/bar.  The user can make a
 ## new dir variable or use a nobase_ target for the latter case.
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(%DIR%%PRIMARY%_INSTALL) $$list2 '$(DESTDIR)$(%NDIR%dir)'"; \
-         $(%DIR%%PRIMARY%_INSTALL) $$list2 "$(DESTDIR)$(%NDIR%dir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(%DIR%%PRIMARY%_INSTALL) $$files '$(DESTDIR)$(%NDIR%dir)'"; \
+         $(%DIR%%PRIMARY%_INSTALL) $$files "$(DESTDIR)$(%NDIR%dir)"; done
 else !%?BASE%
        @list='$(%DIR%_%PRIMARY%)'; $(am__nobase_list) | \
        while read dir files; do \

diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am
index 8f89009..eb0bba1 100644 (file)
--- a/lib/am/inst-vars.am
+++ b/lib/am/inst-vars.am
@@ -26,7 +26,7 @@ am__vpath_adj = case $$p in \
 ## Strip all directories.
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 ## Number of files to install concurrently.
-am__install_max = 50
+am__install_max = 40
 ## Take a $list of nobase files, collect them, indexed by their
 ## srcdir-stripped dirnames.  For up to am__install_max files, output
 ## a line containing the dirname and the files, space-separated.
@@ -42,4 +42,8 @@ am__nobase_list = \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir " " files[dir] }'
+## Collect up to 40 files per line from stdin.
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 endif %?FIRST%

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 6bd65af..0f482a8 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -144,13 +144,13 @@ include inst-vars.am
 install-dvi-am: $(DVIS)
        @$(NORMAL_INSTALL)
        test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
-       @list='$(DVIS)'; list2=; for p in $$list; do \
+       @list='$(DVIS)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(dvidir)'"; \
-         $(INSTALL_DATA) $$list2 "$(DESTDIR)$(dvidir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)"; done
 
 install-html-am: $(HTMLS)
        @$(NORMAL_INSTALL)
@@ -167,15 +167,16 @@ install-html-am: $(HTMLS)
            list2="$$list2 $$d$$p"; \
          fi; \
        done; \
-       test -z "$$list2" || { \
-           echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(htmldir)'"; \
-           $(INSTALL_DATA) $$list2 "$(DESTDIR)$(htmldir)"; }
+       test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)"; done; }
 
 install-info-am: $(INFO_DEPS)
        @$(NORMAL_INSTALL)
        test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       list='$(INFO_DEPS)'; list2=; \
+       list='$(INFO_DEPS)'; \
        for file in $$list; do \
 ## Strip possible $(srcdir) prefix.
          case $$file in \
@@ -195,13 +196,13 @@ install-info-am: $(INFO_DEPS)
          for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
                        $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
            if test -f $$ifile; then \
-             list2="$$list2 $$ifile"; \
+             echo "$$ifile"; \
            else : ; fi; \
          done; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(infodir)'"; \
-         $(INSTALL_DATA) $$list2 "$(DESTDIR)$(infodir)"; }
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)"; done
        @$(POST_INSTALL)
 ## Only run this code if install-info actually exists, and it is not
 ## the Debian install-info.  FIXME: once Debian install-info goes
@@ -234,24 +235,24 @@ install-info-am: $(INFO_DEPS)
 install-pdf-am: $(PDFS)
        @$(NORMAL_INSTALL)
        test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
-       @list='$(PDFS)'; list2=; for p in $$list; do \
+       @list='$(PDFS)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(pdfdir)'"; \
-         $(INSTALL_DATA) $$list2 "$(DESTDIR)$(pdfdir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)"; done
 
 install-ps-am: $(PSS)
        @$(NORMAL_INSTALL)
        test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
-       @list='$(PSS)'; list2=; for p in $$list; do \
+       @list='$(PSS)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(psdir)'"; \
-         $(INSTALL_DATA) $$list2 "$(DESTDIR)$(psdir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)"; done
 
 else ! %?LOCAL-TEXIS%
 install-dvi-am:

diff --git a/m4/Makefile.in b/m4/Makefile.in
index bd44eea..69bdd1f 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -57,7 +57,7 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 50
+am__install_max = 40
 am__nobase_list = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
   for p in $$list; do echo "$$p $$p"; done | \
@@ -66,6 +66,9 @@ am__nobase_list = \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir " " files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(m4datadir)"
 dist_m4dataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_m4data_DATA)
@@ -230,13 +233,13 @@ $(am__aclocal_m4_deps):
 install-dist_m4dataDATA: $(dist_m4data_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)"
-       @list='$(dist_m4data_DATA)'; list2=; for p in $$list; do \
+       @list='$(dist_m4data_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         list2="$$list2 $$d$$p"; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(dist_m4dataDATA_INSTALL) $$list2 '$(DESTDIR)$(m4datadir)'"; \
-         $(dist_m4dataDATA_INSTALL) $$list2 "$(DESTDIR)$(m4datadir)"; }
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(dist_m4dataDATA_INSTALL) $$files '$(DESTDIR)$(m4datadir)'"; \
+         $(dist_m4dataDATA_INSTALL) $$files "$(DESTDIR)$(m4datadir)"; done
 
 uninstall-dist_m4dataDATA:
        @$(NORMAL_UNINSTALL)