mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.NET detection: Don't try to add not existing path

Browse Source 
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@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
David Ostrovsky
2016-03-03 08:49:11 +01:00
committed by Michael Stahl
parent 5adde1bf69
commit 6153a30e1e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -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"