Auto-commit of generated files.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b112c6a..019460a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,6 +67,10 @@ CDPATH=
 # If Make doesn't predefine MAKE, set it here.
 @SET_MAKE@
 
+# Prevent submakes from outputting "Entering directory ..." and
+# "Leaving directory..." diagnostics that would mess up 'make echo-info'.
+QUIET_SUBMAKE = MAKELEVEL=0
+
 # ==================== Things `configure' Might Edit ====================
 
 cache_file = @cache_file@
@@ -249,7 +253,8 @@ INSTALL_INFO = @INSTALL_INFO@
 # By default, we uphold the dignity of our programs.
 INSTALL_STRIP =
 MKDIR_P = @MKDIR_P@
-LN_S = @LN_S@
+# Create a link to a file in the same directory as the target.
+LN_S_FILEONLY = @LN_S_FILEONLY@
 
 # We use gzip to compress installed .el files.
 GZIP_PROG = @GZIP_PROG@
@@ -451,7 +456,7 @@ install-arch-dep: src install-arch-indep install-doc
          chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \
          if test "x${NO_BIN_LINK}" = x; then \
            rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
-           cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \
+           cd $(DESTDIR)${bindir} && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS); \
          fi; \
        else \
          subdir=${ns_appresdir}/site-lisp; \
@@ -609,7 +614,9 @@ install-info: info
           [ -f dir ] || \
             (cd $${thisdir}; \
              ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \
-          info_misc=`cd $${thisdir}/doc/misc; ${MAKE} -s echo-info`; \
+          info_misc=`cd $${thisdir}/doc/misc && \
+               $(QUIET_SUBMAKE) $(MAKE) -s echo-info \
+          `; \
           cd ${srcdir}/info ; \
           for elt in ${INFO_NONMISC} $${info_misc}; do \
              test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@@ -702,7 +709,7 @@ uninstall:
        done
        -rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
        thisdir=`/bin/pwd`; \
-       (info_misc=`cd doc/misc; ${MAKE} -s echo-info`; \
+       (info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
         if cd $(DESTDIR)${infodir}; then \
           for elt in ${INFO_NONMISC} $${info_misc}; do \
             (cd $${thisdir}; \