diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2016-03-03 08:49:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-03-03 11:42:32 +0000 |
| commit | 6153a30e1eba0f7fc05dc2070ebb23f0b2a6df9d (patch) | |
| tree | 81bafdb03b45eeb2a3bd27593a2cd303317dedf3 /configure.ac | |
| parent | 5adde1bf69828da955f5f8ae8d36a4bd52eee055 (diff) | |
.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@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e64c713d2676..b6c14a0a9125 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" |