(install-info): Don't cd to srcdir to avoid breaking install-sh

Other bug fixes

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 137d67a7721418ae8aded45d98d45c474d38d158..9a076578a0833c2f3dd685c7a84e9ac958ba76b9 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -16,11 +16,12 @@ install:: install-info
 # `pwd` because there might be a newer file there than in srcdir.
 install-info: $(INFO_DEPS)
        $(top_srcdir)/mkinstalldirs $(infodir)
-       here=`pwd`; cd $(srcdir); for file in *.info*; do \
-         if test -f $$here/$$file; then        \
-           d=$here;                            \
+       cd $(srcdir);                           \
+       for file in `cd $(srcdir); echo *.info*`; do \
+         if test -f $$file; then               \
+           d=.;                                \
          else                                  \
-           d=.                                 \
+           d=$(srcdir);                        \
          fi;                                   \
          $(INSTALL_DATA) $$d/$$file $(infodir)/$$file; \
          if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
@@ -33,7 +34,7 @@ install-info: $(INFO_DEPS)
 uninstall:: uninstall-info
 
 uninstall-info:
-       cd $(srcdir); for file in *.info*; do \
+       cd $(srcdir); for file in *.info*; do
          rm -f $(infodir)/$$file; \
        done
 

diff --git a/texinfos.am b/texinfos.am
index 137d67a7721418ae8aded45d98d45c474d38d158..9a076578a0833c2f3dd685c7a84e9ac958ba76b9 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -16,11 +16,12 @@ install:: install-info
 # `pwd` because there might be a newer file there than in srcdir.
 install-info: $(INFO_DEPS)
        $(top_srcdir)/mkinstalldirs $(infodir)
-       here=`pwd`; cd $(srcdir); for file in *.info*; do \
-         if test -f $$here/$$file; then        \
-           d=$here;                            \
+       cd $(srcdir);                           \
+       for file in `cd $(srcdir); echo *.info*`; do \
+         if test -f $$file; then               \
+           d=.;                                \
          else                                  \
-           d=.                                 \
+           d=$(srcdir);                        \
          fi;                                   \
          $(INSTALL_DATA) $$d/$$file $(infodir)/$$file; \
          if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
@@ -33,7 +34,7 @@ install-info: $(INFO_DEPS)
 uninstall:: uninstall-info
 
 uninstall-info:
-       cd $(srcdir); for file in *.info*; do \
+       cd $(srcdir); for file in *.info*; do
          rm -f $(infodir)/$$file; \
        done