summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-09-28 09:57:56 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-09-28 08:59:18 +0000
commitcc09a58ef3fd39db61369cf399de11360966d39e (patch)
tree80439a686b4d91a78cf4d0ed576f193ed367789b /scp2
parentb107353addfe35cc40864b7fb5ff4fee42fff6cf (diff)
One more GUIBASE -> USING_X11
Change-Id: I383b83b3778b11a012a931c19a2be85445af29c5 Reviewed-on: https://gerrit.libreoffice.org/18900 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'scp2')
-rw-r--r--scp2/InstallModule_ooo.mk2
-rw-r--r--scp2/source/ooo/file_extra_ooo.scp2
2 files changed, 2 insertions, 2 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 955a0d7fffc2..ccbe54817752 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
ifeq ($(USING_X11),TRUE)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
- -DGUIBASE_UNX \
+ -DUSING_X11 \
))
endif
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index f56c028ec41d..11c6ffa16e5c 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -74,7 +74,7 @@ File gid_File_Extra_Databasebiblio
Name = "extras_databasebiblio.filelist";
End
-#ifdef GUIBASE_UNX
+#ifdef USING_X11
File gid_File_Extra_Fontunxppds
Dir = FILELIST_DIR;