Merge from trunk.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c55d39f..aedb9ac 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,6 +48,8 @@
 #
 # make extraclean
 #      Still more severe - delete backup and autosave files, too.
+#      Also generated files that do not normally change and can be slow
+#      to rebuild (eg leim/ja-dic).
 #
 # make bootstrap
 #      Removes all the compiled files to force a new bootstrap from a
@@ -336,7 +338,7 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
 epaths-force-w32: FRC
        @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \
          w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \
-         w32prefixpattern=`echo "${w32prefix}" | ${msys_sed_sh_escape}` ; \
+         w32prefixpattern=`echo "$${w32prefix}" | ${msys_sed_sh_escape}` ; \
          w32locallisppath=`${srcdir}/build-aux/msys-to-w32 "${locallisppath}" N ":" "\\;" | ${msys_w32prefix_subst}` ; \
          sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$          \
          -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${w32locallisppath}"'";' \
@@ -855,7 +857,7 @@ distclean: FRC
        cd leim     && $(MAKE) $(MFLAGS) distclean
        cd lisp     && $(MAKE) $(MFLAGS) distclean
        cd nextstep && $(MAKE) $(MFLAGS) distclean
-       for dir in test/automated admin/unidata; do \
+       for dir in test/automated admin/grammars admin/unidata; do \
          [ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) distclean); \
        done
        ${top_distclean}
@@ -877,7 +879,7 @@ bootstrap-clean: FRC
        cd leim     && $(MAKE) $(MFLAGS) bootstrap-clean
        cd lisp     && $(MAKE) $(MFLAGS) bootstrap-clean
        cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean
-       for dir in test/automated admin/unidata; do \
+       for dir in test/automated admin/grammars admin/unidata; do \
          [ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) bootstrap-clean); \
        done
        [ ! -f config.log ] || mv -f config.log config.log~
@@ -901,7 +903,7 @@ maintainer-clean: bootstrap-clean FRC
        cd src  && $(MAKE) $(MFLAGS) maintainer-clean
        cd leim && $(MAKE) $(MFLAGS) maintainer-clean
        cd lisp && $(MAKE) $(MFLAGS) maintainer-clean
-       for dir in test/automated admin/unidata; do \
+       for dir in test/automated admin/grammars admin/unidata; do \
          [ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) maintainer-clean); \
        done
        ${top_maintainer_clean}