* widget.c (update_wm_hints): Return if wmshell is null.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 29e2029..c0d1088 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -339,7 +339,8 @@ GNULIB_MODULES = \
   mktime pthread_sigmask readlink \
   socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
 GNULIB_TOOL_FLAGS = \
- --avoid=threadlib \
+ --avoid=msvc-inval --avoid=msvc-nothrow --avoid=pathmax \
+ --avoid=raise --avoid=threadlib \
  --conditional-dependencies --import --no-changelog --no-vc-files \
  --makefile-name=gnulib.mk
 sync-from-gnulib: $(gnulib_srcdir)
@@ -473,10 +474,10 @@ install-arch-dep: mkdir
            if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
            if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
            rm -fr share ) ; \
-         ( cd ${ns_appbindir}libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \
-           rm -fr emacs ) ; \
-         ( cd ${ns_appbindir}bin ; rm -f emacs emacs-24* ; \
-           ln -sf ../libexec/* .) ; \
+         ( cd ${ns_appbindir} ; \
+           if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \
+           rm -fr emacs; if cd ../bin; then rm -f emacs emacs-24*; \
+           ln -sf ../libexec/* . ; fi ; fi ) ; \
        else true ; fi
 
 ## FIXME is the emacs-24* bit above really necessary and correct?
@@ -665,7 +666,7 @@ install-etc: mkdir
 ### Install LEIM files.  Although they are machine-independent, we
 ### have separate target here instead of including it in
 ### `install-arch-indep'.  People who extracted LEIM files after they
-### insalled Emacs itself can install only LEIM files by this target.
+### installed Emacs itself can install only LEIM files by this target.
 install-leim: leim/Makefile mkdir
        cd leim; $(MAKE) install