[Libreoffice-commits] core.git: scp2/InstallModule_ooo.mk scp2/source

[Samuel Mehrbrodt]

 scp2/InstallModule_ooo.mk          |    2 +-
 scp2/source/ooo/file_extra_ooo.scp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cc09a58ef3fd39db61369cf399de11360966d39e
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Sep 28 09:57:56 2015 +0200

    One more GUIBASE -> USING_X11
    
    Change-Id: I383b83b3778b11a012a931c19a2be85445af29c5
    Reviewed-on: https://gerrit.libreoffice.org/18900
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 955a0d7..ccbe548 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 f56c028..11c6ffa 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;