diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-13 16:02:03 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-17 16:46:48 +0100 |
| commit | 98bc62b140a2692bef467452f000421e51b9a1f0 (patch) | |
| tree | f666d0758f4c4876fce9c9bd7addc684c273c585 /scp2 | |
| parent | 27c36c7bddb3c8bb27fe55972833344145eaba59 (diff) | |
make building and installing of nsplugin more consistent
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 730de98d4a1a..474d5379c6dc 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 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 8e18e8e97f7c..091415b60cb6 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 be79403524c8..112eed7ae0d8 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 |