ooo-build r14781 - trunk/patches/dev300
- From: rengelhard svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14781 - trunk/patches/dev300
- Date: Mon, 8 Dec 2008 17:46:23 +0000 (UTC)
Author: rengelhard
Date: Mon Dec 8 17:46:23 2008
New Revision: 14781
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14781&view=rev
Log:
update
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 17:46:23 2008
@@ -7,14 +7,14 @@
.INCLUDE : ..$/util$/makefile.pmk
+.IF "$(SYSTEM_MOZILLA)" == "YES"
-+INCPRE+=-I$(MOZ_INC)$/plugin
++INCPRE+=-I$(MOZ_INC) -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
++INCPRE+=-I$(MOZ_INC) -I$(MOZ_INC)$/nspr
+.ELSE
INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
@@ -31,14 +31,14 @@
# --- Files --------------------------------------------------------
+.IF "$(SYSTEM_MOZILLA)" == "YES"
-+INCPRE+=-I$(MOZ_INC)/plugin
++INCPRE+=-I$(MOZ_INC) -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
++INCPRE+=-I$(MOZ_INC) -I$(MOZ_INC)$/nspr
+.ELSE
INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]