diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-18 14:12:08 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-25 07:25:46 +0000 |
| commit | c29ea22b899f24dab3eecce9df8c70544f044e1b (patch) | |
| tree | 83c000b95f9863a938facc96b75d7e65e7e2b127 /postprocess | |
| parent | edb9ef41f29bf3477b8985ee409ce2d22214e63f (diff) | |
Replace GUIBASE with USING_X11
That's what it actually means. Also make it a boolean
Change-Id: I249e18351253b34b5dada28e2a9c6bc0c06b730c
Reviewed-on: https://gerrit.libreoffice.org/18688
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 510b444f2cad..0ea2c676d694 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -303,7 +303,7 @@ postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Office/Paths-macosx.xcu # Inet-macosx.xcu must come after Inet.xcu postprocess_DRIVERS += macab -else ifeq (unx,$(GUIBASE)) +else ifeq ($(USING_X11), TRUE) postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Inet-unixdesktop.xcu \ $(postprocess_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \ @@ -431,7 +431,7 @@ postprocess_FILES_postgresql := $(call gb_XcuModuleTarget_get_target,connectivit postprocess_DRIVERS += postgresql endif -ifeq (unx,$(GUIBASE)) +ifeq ($(USING_X11), TRUE) ifneq (,$(or $(filter TRUETRUE,$(ENABLE_GCONF)$(ENABLE_LOCKDOWN))$(filter TRUE,$(ENABLE_GIO)))) postprocess_XCDS += gnome.xcd postprocess_DEPS_gnome := main @@ -446,7 +446,7 @@ postprocess_FILES_gnome += \ $(postprocess_MOD)/org/openoffice/ucb/Configuration-gio.xcu endif endif -endif # unx == $(GUIBASE) +endif # $(USING_X11) == TRUE ifeq ($(ENABLE_ONLINE_UPDATE),TRUE) postprocess_XCDS += onlineupdate.xcd |