[Emacs-diffs] emacs-24 r116954: Fix creation of emacs.exe hardlink at "make install" time on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 116954
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-04-13 09:44:22 +0300
message:
  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.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-04-11 06:39:11 +0000
+++ b/ChangeLog 2014-04-13 06:44:22 +0000
@@ -1,3 +1,8 @@
+2014-04-13  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * make-dist: Do not distribute generated admin/grammars/Makefile.

=== modified file 'configure.ac'
--- a/configure.ac      2014-04-11 05:53:02 +0000
+++ b/configure.ac      2014-04-13 06:44:22 +0000
@@ -938,11 +938,21 @@
 
 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