diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2018-06-05 08:29:21 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2018-06-13 11:17:29 +0200 |
| commit | f971bdb026735fdecd777d0d2edc515124f9e822 (patch) | |
| tree | bbb57ebafdef62fcf69e2262f18cf21f7494f01a | |
| parent | 2b2152038761839fdd053f69973f1328eb9581b9 (diff) | |
Build kde-integration for '--enable-gtk3-kde5' as well
The relevant files ('libvclplug_gtk3_kde5lo.so',
'lo_kde5filepicker') resulting from the '--enable-gtk3-kde5'
build option are put into the kde-integration package
(e.g. a Debian package when the '--with-package-format=deb'
option is given).
However, so far that package was only created at all when
one of the options '--enable-kde4', '--enable-qt5' or
'--enable-kde5' was given in addition.
Since those are not needed for the gtk3_kde5 vclplug, also
build the kde-integration when none of the others is
built in addition.
Change-Id: I86eb71ac7879c7226c9eaa89774b68125212a75c
Reviewed-on: https://gerrit.libreoffice.org/55310
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | scp2/InstallScript_setup_osl.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index 8ce3e2ecef79..a37a4552c139 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -35,7 +35,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ scp2/gnome \ ) \ - $(if $(filter TRUE,$(ENABLE_KDE4) $(ENABLE_QT5) $(ENABLE_KDE5)),\ + $(if $(filter TRUE,$(ENABLE_KDE4) $(ENABLE_QT5) $(ENABLE_KDE5) $(ENABLE_GTK3_KDE5)),\ scp2/kde \ ) \ $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 1c3ed8df600f..c414e09045cb 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ InstallModule_gnome \ ) \ - $(if $(filter TRUE,$(ENABLE_KDE4) $(ENABLE_QT5) $(ENABLE_KDE5)),\ + $(if $(filter TRUE,$(ENABLE_KDE4) $(ENABLE_QT5) $(ENABLE_KDE5) $(ENABLE_GTK3_KDE5)),\ InstallModule_kde \ ) \ )) |