Fix creation of emacs.exe hardlink at "make install" time on MS-Windows.

 configure.ac (LN_S_FILEONLY, LN_S): Use "/bin/ln" on MinGW, to
 ensure the MSYS ln.exe is invoked.

diff --git a/ChangeLog b/ChangeLog
index 4dca366c75e2cc2418e8a83c87f44bfb63937e69..69e03a1bab5a067befe65070f79fb51407e82c9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-13  Eli Zaretskii  <eliz@gnu.org>
+
+       * configure.ac (LN_S_FILEONLY, LN_S): Use "/bin/ln" on MinGW, to
+       ensure the MSYS ln.exe is invoked.
+
 2014-04-11  Glenn Morris  <rgm@gnu.org>
 
        * make-dist: Do not distribute generated admin/grammars/Makefile.

diff --git a/configure.ac b/configure.ac
index e427caa03c038ffcebc0ed51bd997e13b77e04d6..d8225f48a35da738bc540a23cd2573a7e32789c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -938,11 +938,21 @@ rm -f conf$$ conf$$.file
 
 LN_S_FILEONLY='cp -p'
 
+dnl On MinGW, ensure we will call the MSYS /bin/ln.exe, not some
+dnl random program in the current directory.
 if (echo >conf$$.file) 2>/dev/null; then
   if ln -s conf$$.file conf$$ 2>/dev/null; then
-    LN_S_FILEONLY='ln -s'
+    if test "$opsys" = "mingw32"; then
+      LN_S_FILEONLY='/bin/ln -s'
+    else
+      LN_S_FILEONLY='ln -s'
+    fi
   elif ln conf$$.file conf$$ 2>/dev/null; then
-    LN_S_FILEONLY=ln
+    if test "$opsys" = "mingw32"; then
+      LN_S_FILEONLY=/bin/ln
+    else
+      LN_S_FILEONLY=ln
+    fi
   fi
 fi