* lisp/term/ns-win.el (ns-initialize-window-system): Set locale-coding-system

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d5cd6bd..c6254fd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@
 # make docs
 #      Make Emacs documentation files from their sources; requires makeinfo.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # This may not work with certain non-GNU make's.  It only matters when
 # inheriting a CDPATH not starting with the current directory.
@@ -259,8 +259,6 @@ LN_S_FILEONLY = @LN_S_FILEONLY@
 
 # We use gzip to compress installed .el files.
 GZIP_PROG = @GZIP_PROG@
-# If non-nil, gzip the installed Info and man pages.
-GZIP_INFO = @GZIP_INFO@
 
 # ============================= Targets ==============================
 
@@ -352,9 +350,13 @@ epaths-force-w32: FRC
          -e "/^.*#/s|@SRC@|$${w32srcdir}|g") &&                \
        ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
 
+# If lib/Makefile would build files in '.', then build them before
+# building 'lib', to avoid races with parallel makes.
+lib: am--refresh
+
 lib-src src: $(NTDIR) lib
 
-src:   lib-src FRC
+src: lib-src
 
 # We need to build `emacs' in `src' to compile the *.elc files in `lisp'
 # and `leim'.
@@ -376,18 +378,15 @@ lib lib-src lisp leim nt: Makefile FRC
 # all preloaded elisp files, and only then dump the actual src/emacs, which
 # is not wrong, but is overkill in 99.99% of the cases.
 src: Makefile FRC
-       boot=bootstrap-emacs$(EXEEXT);                         \
-       if [ ! -x "src/$$boot" ]; then                                     \
-           cd $@; $(MAKE) all $(MFLAGS)                                   \
-             CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}'         \
-             LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"; \
-       fi;
-       if [ -r .bzr/checkout/dirstate ]; then                  \
-           vcswitness="`pwd`/.bzr/checkout/dirstate";  \
-       fi;                                                     \
-       cd $@; $(MAKE) all $(MFLAGS)                           \
-         CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
-         LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="" \
+       dirstate='.bzr/checkout/dirstate';                              \
+       vcswitness='$$(srcdir)/../'$$dirstate;                          \
+       [ -r "$(srcdir)/$$dirstate" ] || vcswitness='';                 \
+       cd $@ || exit;                                                  \
+       boot=bootstrap-emacs$(EXEEXT);                                  \
+       [ ! -x "$$boot" ] || boot='';                                   \
+       $(MAKE) all $(MFLAGS)                                           \
+         CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}'          \
+         LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"   \
          VCSWITNESS="$$vcswitness"
 
 blessmail: Makefile src FRC
@@ -661,7 +660,7 @@ install-info: info
              for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
               (cd $${thisdir}; \
                ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \
-               ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
+               [ -n "${GZIP_PROG}" ] || continue ; \
                rm -f $(DESTDIR)${infodir}/$$f.gz; \
                ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
              done; \
@@ -683,7 +682,7 @@ install-man:
          dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
          (cd $${thisdir}; \
           ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \
-         ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
+         [ -n "${GZIP_PROG}" ] || continue ; \
          rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \
          ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \
        done
@@ -753,12 +752,12 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
           for elt in ${INFO_NONMISC} $${info_misc}; do \
             (cd $${thisdir}; \
              $(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-            if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
+            if [ -n "${GZIP_PROG}" ]; then \
                ext=.gz; else ext=; fi; \
             rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \
           done; \
         fi)
-       (if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
+       (if [ -n "${GZIP_PROG}" ]; then \
            ext=.gz; else ext=; fi; \
         if cd ${mansrcdir}; then \
           for page in *.1; do \