-moz_include_dir := \
- $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/include/mozilla
-moz_lib_dir := \
- $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/lib/mozilla
+bindir := $(prefix)/bin
+sharedir := $(prefix)/share
+docdir := $(sharedir)/doc
+mandir := $(sharedir)/man
+
+# Prefer XULRunner to the old Mozilla
+ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
+ moz_name := xulrunner
+ moz_pc := xulrunner-gtkmozembed
+else
+ moz_name := mozilla
+ moz_pc := mozilla-gtkmozembed
+endif
+
+moz_prefix := $(shell pkg-config --variable=prefix $(moz_pc))
+moz_include_dir := $(shell pkg-config --variable=includedir $(moz_pc))
+moz_lib_dir := $(moz_prefix)/lib/$(moz_name)
+
+moz_version := $(shell pkg-config --modversion $(moz_pc))
+moz_version_major := $(word 1,$(subst ., ,$(moz_version)))
+moz_version_minor := $(word 2,$(subst ., ,$(moz_version)))