Release versions 1.2.11 and 1.2.11-1

[videolink.git] / Makefile

diff --git a/Makefile b/Makefile
index 72ce8390958b463dc5a16a04b2a6e5faa9494ec5..380c7a04a59424e293c7394aac6fa4f8bb7a0869 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,12 @@ mandir := $(sharedir)/man
 ifeq ($(shell pkg-config --atleast-version 1.9 mozilla-gtkmozembed-embedding && echo yes),yes)
     moz_name := xulrunner-1.9
     moz_pc := mozilla-gtkmozembed-embedding
-    moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr)
+    moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr) -DXPCOM_GLUE_USE_NSPR
     moz_unstable_cppflags_extra :=
+    moz_ldflags_extra := $(shell pkg-config --libs xulrunner-nspr)
     # libxpcomglue needs libdl, but mozilla-gtkmozembed-embedding.pc
     # doesn't mention it.
-    moz_ldflags_extra := -ldl
+    moz_ldflags_extra += -ldl
 else
     ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
     moz_name := xulrunner
@@ -33,6 +34,8 @@ 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))
+# HACK: Replace 'b' for beta with micro=-1
+moz_version := $(subst b,.-1.,$(moz_version))
 moz_version_major := $(word 1,$(subst ., ,$(moz_version)))
 moz_version_minor := $(word 2,$(subst ., ,$(moz_version)))
 moz_version_micro := $(word 3,$(subst ., ,$(moz_version)))