Avoid building blessmail and use hard links when installing emacs.exe.

3 files changed, 15 insertions, 2 deletions

diff --git a/Makefile.in b/Makefile.in
index 6e0f151ea1a..86eba76005b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -257,6 +257,8 @@ INSTALL_INFO = @INSTALL_INFO@
 INSTALL_STRIP =
 MKDIR_P = @MKDIR_P@
 LN_S = @LN_S@
+# Used in "make install".  Usually, $(LN_S), but MS-Windows uses hard links.
+LN_EMACS = @LN_EMACS@
 
 # We use gzip to compress installed .el files.
 GZIP_PROG = @GZIP_PROG@
@@ -471,7 +473,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_EMACS) $(EMACSFULL) $(EMACS); \
           fi; \
         else \
           subdir=${ns_appresdir}/site-lisp; \
diff --git a/configure.ac b/configure.ac
index 9c8e05cb30f..3eaf1821b47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -810,6 +810,12 @@ dnl   AC_PROG_RANLIB
 dnl fi
 AC_PROG_LN_S
 
+LN_EMACS="\$(LN_S)"
+if test "$opsys" = "mingw32"; then
+  LN_EMACS="ln"
+fi
+AC_SUBST(LN_EMACS)
+
 AC_PATH_PROG(INSTALL_INFO, install-info, :,
   $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
 dnl Don't use GZIP, which is used by gzip for additional parameters.
@@ -3033,6 +3039,9 @@ case "$opsys" in
       test $ac_cv_header_maillock_h = yes && mail_lock=no
     fi
     ;;
+
+  mingw32)
+    mail_lock="none-needed" ;;
 esac
 
 BLESSMAIL_TARGET=
@@ -3041,6 +3050,8 @@ case "$mail_lock" in
 
   lockf) AC_DEFINE(MAIL_USE_LOCKF, 1, [Define if the mailer uses lockf to interlock the mail spool.]) ;;
 
+  none-needed) ;;
+
   *) BLESSMAIL_TARGET="need-blessmail" ;;
 esac
 AC_SUBST(BLESSMAIL_TARGET)
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 3beb8d4dc17..e0acea867b7 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -241,7 +241,7 @@ $(DESTDIR)${archlibdir}: all
         umask 022; ${MKDIR_P} $(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 \
+        -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score${EXEEXT} && chmod u+s $(DESTDIR)${archlibdir}/update-game-score${EXEEXT}; then \
           chown ${gameuser} $(DESTDIR)${gamedir}; \
           chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
         fi