diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-01-25 10:20:07 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2012-01-25 13:36:30 +0100 |
| commit | d4260355159afda5d91e9f9072e239ffe4ca7a2f (patch) | |
| tree | f7917943c1a3c865859bda263502037f3b2e37f7 | |
| parent | bump product version suffix in the about dialog to "rc2+" (diff) | |
| download | core-d4260355159afda5d91e9f9072e239ffe4ca7a2f.tar.gz core-d4260355159afda5d91e9f9072e239ffe4ca7a2f.zip | |
Fix building and packaging of the mozilla plugin
Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
Signed-off-by: Rene Engelhard <rene@debian.org>
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
| -rw-r--r-- | extensions/source/nsplugin/source/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 3 |
3 files changed, 1 insertions, 8 deletions
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk index 3d522347b486..5b7476408a31 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 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) |