From aa1f3497ed8317b7e4e357e73a7802689ddc52e6 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 13 Apr 2014 09:44:22 +0300 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ configure.ac | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4dca366c75..69e03a1bab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-04-13 Eli Zaretskii + + * 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 * make-dist: Do not distribute generated admin/grammars/Makefile. diff --git a/configure.ac b/configure.ac index e427caa03c..d8225f48a3 100644 --- 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 -- 2.20.1