[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source scp2/source

[Fridrich Strba]

 extensions/source/nsplugin/source/makefile.mk |    4 ----
 scp2/source/ooo/common_brand.scp              |    2 +-
 scp2/source/ooo/file_ooo.scp                  |    3 ---
 3 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 04caf572d6847ff1efce2942b1ba5058797aef9c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jan 25 10:20:07 2012 +0100

    Fix building and packaging of the mozilla plugin
    
    signed-off-by: Tomas Chvatal <tchvatal at suse.cz>

diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index 3d52234..5b74764 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -36,8 +36,6 @@ USE_DEFFILE=TRUE
 
 .INCLUDE :  	settings.mk
 
-.IF "$(WITH_MOZILLA)" != "NO"
-
 .IF "$(SYSTEM_MOZILLA_HEADERS)" == "YES"
 INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
 .ELSE
@@ -160,8 +158,6 @@ DEF2EXPORTFILE=exports.dxp
 DEF2EXPORTFILE=exports_wnt.dxp
 .ENDIF
 
-.ENDIF # $(WITH_MOZILLA) != "NO"
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6c6fb66..aa8c77a 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -642,7 +642,7 @@ File gid_Brand_File_Bin_Libxml2
 End
 #endif
 
-#if !defined WITHOUT_MOZILLA && defined ENABLE_NSPLUGIN
+#ifdef 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 091415b..e7bc85a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -108,8 +108,6 @@ File gid_File_Basic_Tutorials
     Name = "basicsrvtutorials.zip";
 End
 
-#ifndef WITHOUT_MOZILLA
-
 #ifdef ENABLE_NSPLUGIN
 File gid_File_Exe_Nsplugin
         BIN_FILE_BODY;
@@ -122,7 +120,6 @@ File gid_File_Exe_Nsplugin
   #endif
 End
 #endif
-#endif
 
 #if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)