[Libreoffice-commits] .: scp2/source

[Matus Kukan]

 scp2/source/ooo/common_brand.scp |    2 +-
 scp2/source/ooo/file_ooo.scp     |    2 +-
 scp2/source/ooo/makefile.mk      |    4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit aa7e105677017059ab84c4f3bd38b6a511637395
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Jan 13 16:02:03 2012 +0100

    scp2: install nsplugin only in case it's build

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 04131ec..ed8f3b6 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -643,7 +643,7 @@ File gid_Brand_File_Bin_Libxml2
 End
 #endif
 
-#if !defined WITHOUT_MOZILLA && (!defined UNX || defined ENABLE_GTK)
+#if !defined WITHOUT_MOZILLA && defined ENABLE_NSPLUGIN
 File gid_Brand_File_Lib_Npsoplugin
     BIN_FILE_BODY;
     Name = SPECIAL_NAME(npsoplugin);
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 4876614..5263c11 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -110,7 +110,7 @@ End
 
 #ifndef WITHOUT_MOZILLA
 
-#if !defined(UNX) || defined(ENABLE_GTK)
+#ifdef ENABLE_NSPLUGIN
 File gid_File_Exe_Nsplugin
         BIN_FILE_BODY;
         Styles          = (PACKED);
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 96bcb5f..87cc67c 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -66,6 +66,10 @@ SCPDEFS+=-DENABLE_GTK3
 .ENDIF
 .ENDIF			# "$(GUI)"=="UNX"
 
+.IF "$(ENABLE_NSPLUGIN)" == "YES"
+SCPDEFS+=-DENABLE_NSPLUGIN
+.ENDIF
+
 .IF "$(MERGELIBS)" == "TRUE"
 SCPDEFS+=-DMERGELIBS
 .ENDIF