build: fix configure environment of several contribs

Incorrect build environment caused a failure to disable asserts in
libdvdnav which leads to crashes.  Probably other undesirable side effects
as well.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@6757 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs
index 5a7b610e35ab7a7c1d10d7fec0e439958006d2a1..868b251473e064d961b10f397a997bc7e5f8433c 100644 (file)
--- a/contrib/libbluray/module.defs
+++ b/contrib/libbluray/module.defs
@@ -16,6 +16,6 @@ endif
 LIBBLURAY.CONFIGURE.extra += --disable-examples
 
 ifeq (1,$(FEATURE.local_pkgconfig))
-    LIBBLURAY.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-    LIBBLURAY.BUILD.env     = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBBLURAY.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBBLURAY.BUILD.env     += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
 endif

diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
index b6ba27a66702326b12779bb0ae7a30306632d130..27f171be88c153236ca83ae6233f5bcc0c04c0cf 100644 (file)
--- a/contrib/libdvdnav/module.defs
+++ b/contrib/libdvdnav/module.defs
@@ -9,6 +9,6 @@ ifneq (max,$(LIBDVDNAV.GCC.g))
 endif
 
 ifeq (1,$(FEATURE.local_pkgconfig))
-    LIBDVDNAV.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-    LIBDVDNAV.BUILD.env     = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBDVDNAV.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBDVDNAV.BUILD.env     += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
 endif

diff --git a/contrib/libdvdread/module.defs b/contrib/libdvdread/module.defs
index c546b3b177e43254dc8f61bfc60e655ef8c3a845..bf05121d3e3e9ff46d3b3071ab9e5e8db0995207 100644 (file)
--- a/contrib/libdvdread/module.defs
+++ b/contrib/libdvdread/module.defs
@@ -9,6 +9,6 @@ ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
 endif
 
 ifeq (1,$(FEATURE.local_pkgconfig))
-    LIBDVDREAD.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-    LIBDVDREAD.BUILD.env     = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBDVDREAD.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBDVDREAD.BUILD.env     += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
 endif

diff --git a/contrib/libgnurx/module.defs b/contrib/libgnurx/module.defs
index 3d73829f7275e8e67061ffbf961d6b520ad92af4..e8e2ebe0cdc771a26a2509fb592b23bda05accda 100644 (file)
--- a/contrib/libgnurx/module.defs
+++ b/contrib/libgnurx/module.defs
@@ -22,6 +22,6 @@ define LIBGNURX.UNINSTALL
 endef
 
 ifeq (1,$(FEATURE.local_pkgconfig))
-    LIBGNURX.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-    LIBGNURX.BUILD.env     = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBGNURX.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+    LIBGNURX.BUILD.env     += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
 endif