From c29ea22b899f24dab3eecce9df8c70544f044e1b Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Fri, 18 Sep 2015 14:12:08 +0200 Subject: 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 Reviewed-by: Samuel Mehrbrodt --- postprocess/CustomTarget_registry.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'postprocess/CustomTarget_registry.mk') 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 -- cgit