Merge from trunkpending

1 files changed, 5 insertions, 5 deletions

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index f619febbb2b..cc1757e4e3b 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for lib-src subdirectory in GNU Emacs.
-# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2011
+# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2012
 #   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -175,11 +175,11 @@ ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
 LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
 CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
+all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
+
 LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM)
 $(EXE_FILES): ../lib/libgnu.a
 
-all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
-
 ## These targets copy the scripts into the build directory so that
 ## they can be run from there in an uninstalled Emacs.
 ## Nothing to do if pwd = srcdir.
@@ -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 \