diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-10-24 19:17:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-10-24 18:57:04 +0000 |
| commit | 11fc708e71054dcd512a81981e735db375e79aa4 (patch) | |
| tree | c878d72acc121c342eb182a2a23bd47271f85d19 | |
| parent | 4fc31c1569ba1dc0e2e3aaf9eb8f0747776daa04 (diff) | |
Remove left over references to SYSTEM_MOZILLA
In a0c53a961a0af21f69f592b43799cd635c994810 SYSTEM_MOZILLA was removed.
Change-Id: I421a293c7611dd5ed0d810c9c8a80f19faf1689a
Reviewed-on: https://gerrit.libreoffice.org/19580
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | extensions/Library_pl.mk | 6 | ||||
| -rw-r--r-- | extensions/StaticLibrary_plugcon.mk | 6 | ||||
| -rw-r--r-- | extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 6 | ||||
| -rwxr-xr-x | solenv/bin/ooinstall | 5 |
4 files changed, 0 insertions, 23 deletions
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 680877ca4556..82a71d6bcdbe 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -32,12 +32,6 @@ $(eval $(call gb_Library_add_defs,pl,\ endif # ENABLE_JAVA=YES -ifeq ($(SYSTEM_MOZILLA),YES) -$(eval $(call gb_Library_add_defs,pl,\ - -DSYSTEM_MOZILLA \ -)) -endif # SYSTEM_MOZILLA=YES - ifeq ($(OS),SOLARIS) $(eval $(call gb_Library_add_libs,pl,\ -lsocket \ diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 4992309c62cc..149e86b05925 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -36,12 +36,6 @@ $(eval $(call gb_StaticLibrary_add_defs,plugcon,\ endif # ENABLE_JAVA=YES -ifeq ($(SYSTEM_MOZILLA),YES) -$(eval $(call gb_StaticLibrary_add_defs,plugcon,\ - -DSYSTEM_MOZILLA \ -)) -endif # SYSTEM_MOZILLA=YES - ifeq ($(ENABLE_GTK),TRUE) $(eval $(call gb_StaticLibrary_add_defs,plugcon,\ -DENABLE_GTK \ diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index 07932960f91f..ad3fc67d7126 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -55,12 +55,6 @@ extern "C" { #endif #define MOZ_X11 #include <stdio.h> -#ifdef SYSTEM_MOZILLA -#ifndef OJI -# define OJI -#endif -#define MOZ_X11 -#endif #if ! defined ( _NPAPI_H_) && ! defined (npapi_h_) extern "C" { diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 04de7abbccbb..f9034cdc6c78 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -35,11 +35,6 @@ if (defined($ENV{TMPDIR})) { } if (!-d $tmp_dir) {die "Set TMPDIR!\n";} -# Workaround for system Mozilla -if ($ENV{'SYSTEM_MOZILLA'} eq 'YES') { - $ENV{'LD_LIBRARY_PATH'} = "$ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'}"; -} - for $arg (@ARGV) { if ($arg eq '-s' || $arg eq '--strip') { $strip = "-strip"; |