From 2bbd9a5bbef87a292d63b8305911c2c9d1211d24 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sun, 31 Dec 2006 10:02:46 +0000 Subject: Make all assignments conditional and fix a missing quote git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1108 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/poky-bleeding.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta/conf/distro') diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index 1ca605aac..7637a0d2f 100644 --- a/meta/conf/distro/poky-bleeding.conf +++ b/meta/conf/distro/poky-bleeding.conf @@ -5,17 +5,17 @@ PREFERRED_VERSION_cairo ?= "1.3.10" PREFERRED_VERSION_pango ?= "1.15.2" PREFERRED_VERSION_gtk+ ?= "2.10.6" -PREFERRED_VERSION_dbus = "1.0.1" -PREFERRED_VERSION_dbus-native = "1.0.1" +PREFERRED_VERSION_dbus ?= "1.0.1" +PREFERRED_VERSION_dbus-native ?= "1.0.1" PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" -PREFERRED_VERSION_dbus-glib = "0.7.2 -PREFERRED_VERSION_dbus-glib-native = "0.7.2 +PREFERRED_VERSION_dbus-glib ?= "0.7.2" +PREFERRED_VERSION_dbus-glib-native ?= "0.7.2" SRCDATE_gconf-dbus ?= "20061219" -PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs" -PREFERRED_VERSION_gnome-vfs = "2.16.3" -PREFERRED_PROVIDER_gnome-vfs-plugin-dbus = "gnome-vfs" +PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" +PREFERRED_VERSION_gnome-vfs ?= "2.16.3" +PREFERRED_PROVIDER_gnome-vfs-plugin-dbus ?= "gnome-vfs" require conf/distro/poky.conf -- cgit v1.2.3