diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-12-07 22:43:55 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-12-07 22:45:08 +0100 |
| commit | d90427d767fd9dae298577ef114bfef3e2618868 (patch) | |
| tree | f8af881c5d012ba82182570799fbefb2cdcb003d /scripting/Module_scripting.mk | |
| parent | Match conditional for glxtest static library in vcl (diff) | |
| download | core-d90427d767fd9dae298577ef114bfef3e2618868.tar.gz core-d90427d767fd9dae298577ef114bfef3e2618868.zip | |
scripting: more inconsistent Package conditions
Change-Id: Ifcefef2de15aab4dae6e14b3e689504d4fe9d11e
Diffstat (limited to 'scripting/Module_scripting.mk')
| -rw-r--r-- | scripting/Module_scripting.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk index b2db3e1dc9c3..1d603d585a11 100644 --- a/scripting/Module_scripting.mk +++ b/scripting/Module_scripting.mk @@ -31,16 +31,18 @@ $(eval $(call gb_Module_add_targets,scripting,\ $(if $(ENABLE_SCRIPTING_BEANSHELL),Package_ScriptsBeanShell) \ $(if $(ENABLE_SCRIPTING_JAVASCRIPT),Package_ScriptsJavaScript) \ ) \ - Package_scriptbindinglib \ - $(if $(DISABLE_PYTHON),,Package_scriptproviderforpython) \ - Package_ScriptsPython \ + $(if $(DISABLE_SCRIPTING),,Package_scriptbindinglib) \ + $(if $(DISABLE_PYTHON),,\ + Package_scriptproviderforpython \ + Package_ScriptsPython \ + Pyuno_mailmerge \ + ) \ Library_basprov \ Library_dlgprov \ Library_protocolhandler \ Library_scriptframe \ Library_stringresource \ Library_vbaevents \ - Pyuno_mailmerge \ )) endif |