diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-09 22:39:42 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-03-04 17:21:50 +0100 |
| commit | aa37fdc4f6d9164a70840263789780bc3702da1b (patch) | |
| tree | 1aa27f3c7fb3bee12c937cccc2588164224c5f38 /postprocess | |
| parent | 189a3d6a1c9bc7b7bcef01ec36df99d3059e72d9 (diff) | |
fdo#60491: scp2: always package emboleobj library on non-WNT platforms
(regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined
DISABLE_ATL on all platforms in configure)
(cherry picked from commit ca8ac449e3524f895de1e94a3c5d511591031b40)
Conflicts:
postprocess/Rdb_services.mk
Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda
Reviewed-on: https://gerrit.libreoffice.org/2098
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 09e296baf17b..eb073b57a055 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -223,12 +223,12 @@ my_components += \ .ENDIF -.IF "$(DISABLE_ATL)" == "" .IF "$(OS)" == "WNT" +.IF "$(DISABLE_ATL)" == "" my_components += component/embeddedobj/source/msole/emboleobj.windows +.ENDIF .ELSE my_components += component/embeddedobj/source/msole/emboleobj -.ENDIF .END .IF "$(DISABLE_NEON)" != "TRUE" |