diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-01-25 10:20:07 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-01-25 10:21:08 +0100 |
| commit | 04caf572d6847ff1efce2942b1ba5058797aef9c (patch) | |
| tree | 2f841284d5a31ca389eee8ac866abd38f9840e8c /scp2 | |
| parent | eb9b34079d23351e9626aa57e18d31adbbb8f4fa (diff) | |
Fix building and packaging of the mozilla plugin
signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 6c6fb66f2e50..aa8c77a44d49 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 091415b60cb6..e7bc85a0a285 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) |