diff options
| author | Mathias Michel <matm@gmx.fr> | 2013-06-07 01:38:45 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-06-07 14:11:23 +0000 |
| commit | 8e784b59f1c1ce33dc95a6c591ee514383b28f3f (patch) | |
| tree | 403ab9b40e32267ee0f9fcc72c1c9162c6cab28d /scp2/InstallModule_windows.mk | |
| parent | fdo#65502 - EmfFillPie fix. (diff) | |
| download | core-8e784b59f1c1ce33dc95a6c591ee514383b28f3f.tar.gz core-8e784b59f1c1ce33dc95a6c591ee514383b28f3f.zip | |
Build: fix non-existent merge modules for MS Visual Studio Express versions
Change-Id: Id19f3fde0803e9242ca1e7279fd814262c74f6ef
Reviewed-on: https://gerrit.libreoffice.org/4182
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'scp2/InstallModule_windows.mk')
| -rw-r--r-- | scp2/InstallModule_windows.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scp2/InstallModule_windows.mk b/scp2/InstallModule_windows.mk index 0caaa479b4ea..296f7fccfa5b 100644 --- a/scp2/InstallModule_windows.mk +++ b/scp2/InstallModule_windows.mk @@ -21,7 +21,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/windows,\ $(eval $(call gb_InstallModule_add_scpfiles,scp2/windows,\ scp2/source/ooo/folder_ooo \ - scp2/source/ooo/vc_redist \ + $(if $(MSM_PATH),scp2/source/ooo/vc_redist) \ scp2/source/ooo/windowscustomaction_ooo \ )) |