ooo-build r14770 - trunk/patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Dec  8 00:09:31 2008
New Revision: 14770
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14770&view=rev

Log:
also extensions/source/plugin/unx

Modified:
   trunk/patches/dev300/extensions-missing-MOZ_INC.diff

Modified: trunk/patches/dev300/extensions-missing-MOZ_INC.diff
==============================================================================
--- trunk/patches/dev300/extensions-missing-MOZ_INC.diff	(original)
+++ trunk/patches/dev300/extensions-missing-MOZ_INC.diff	Mon Dec  8 00:09:31 2008
@@ -22,3 +22,27 @@
  CDEFS+=-DOJI
  .ENDIF
  
+Index: makefile.mk
+===================================================================
+--- extensions/source/plugin/unx/makefile.mk	(Revision 264632)
++++ extensions/source/plugin/unx/makefile.mk	(Arbeitskopie)
+@@ -45,10 +45,19 @@
+ 
+ # --- Files --------------------------------------------------------
+ 
++.IF "$(SYSTEM_MOZILLA)" == "YES"
++INCPRE+=-I$(MOZ_INC)/plugin
++.ELSE
+ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
++.ENDIF
+ .IF "$(SOLAR_JAVA)" != ""
++.IF "$(SYSTEM_MOZILLA)" == "YES"
++INCPRE+=-I$(MOZ_INC)$/java
++INCPRE+=-I$(MOZ_INC)$/nspr
++.ELSE
+ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
+ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
++.ENDIF
+ CDEFS+=-DOJI
+ .ENDIF
+