[Libreoffice-commits] core.git: configure.ac

[David Ostrovsky]

 configure.ac |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6153a30e1eba0f7fc05dc2070ebb23f0b2a6df9d
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Thu Mar 3 08:49:11 2016 +0100

    .NET detection: Don't try to add not existing path
    
    This fixed this warning:
    
      cygpath: cannot create short name of \
      C:\PROGRA~2\WI3CF2~1\NETFXSDK\4.6\bin
    
    Change-Id: I2d4e3d2c5e4c3348552355f91a340438eb0f9e8a
    Reviewed-on: https://gerrit.libreoffice.org/22850
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/configure.ac b/configure.ac
index e64c713..b6c14a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12876,7 +12876,10 @@ else
             # needed for msi packaging
             pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before"
         fi
-        pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
+        # .NET 4.6 and higher don't have bin directory
+        if test -f "$DOTNET_FRAMEWORK_HOME/bin"; then
+            pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
+        fi
         pathmunge "$ASM_HOME" "before"
         pathmunge "$WINDOWS_SDK_HOME/bin" "before"
         pathmunge "$CSC_PATH" "before"