upstream

2 files changed, 7 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 9041eae8bbe..65ca56b17a8 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved
+        to build-aux (Bug#9169).
+
 2011-09-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Integer and memory overflow issues (Bug#9397).
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index f619febbb2b..499305ec512 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -229,13 +229,13 @@ maybe-blessmail: $(BLESSMAIL_TARGET)
 $(DESTDIR)${archlibdir}: all
         @echo
         @echo "Installing utilities run internally by Emacs."
-        umask 022; $(top_srcdir)/install-sh -d $(DESTDIR)${archlibdir}
+        umask 022; $(top_srcdir)/build-aux/install-sh -d $(DESTDIR)${archlibdir}
         if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
           for file in ${UTILITIES}; do \
             $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
           done ; \
         fi
-        umask 022; $(top_srcdir)/install-sh -d $(DESTDIR)${gamedir}; \
+        umask 022; $(top_srcdir)/build-aux/install-sh -d $(DESTDIR)${gamedir}; \
         touch $(DESTDIR)${gamedir}/snake-scores; \
         touch $(DESTDIR)${gamedir}/tetris-scores
         -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \