summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-12-21 10:13:31 +0000
committerOliver Bolte <obo@openoffice.org>2005-12-21 10:13:31 +0000
commit4595d591f7f3d0a928a00a32ec83166321768e76 (patch)
treec60435282edc8455f04c18c086db0244eb200370 /extensions
parentbff65838aef949946b90be2516457ba0f54a00ab (diff)
INTEGRATION: CWS cmcfixes21 (1.14.48); FILE MERGED
2005/11/10 15:57:08 cmc 1.14.48.1: #ii49720# some distros have a seperate nspr package instead of mozilla-nspr
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/nsplugin/source/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index a4cfc276bb51..90beb9c33af4 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.14 $
+# $Revision: 1.15 $
#
-# last change: $Author: rt $ $Date: 2005-09-08 19:38:38 $
+# last change: $Author: obo $ $Date: 2005-12-21 11:13:31 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -54,7 +54,7 @@ dummy:
.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
INC+= -DNP_LINUX
.IF "$(SYSTEM_MOZILLA)" == "YES"
-INCPRE=-I$(MOZ_INC)/nspr -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin
+INCPRE=$(MOZ_NSPR_CFLAGS) -I$(MOZ_INC)/java -I$(MOZ_INC)/plugin
# not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
CFLAGS+=-DSYSTEM_MOZILLA -DMOZ_X11
.ENDIF