summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2006-12-31 10:02:46 +0000
committerRoss Burton <ross@openedhand.com>2006-12-31 10:02:46 +0000
commit2bbd9a5bbef87a292d63b8305911c2c9d1211d24 (patch)
tree67fcef808cbc183b8af8c149760cb093e7d38c7b /meta
parentcaf483abb0e6bf38a3349a2aa32e897276599298 (diff)
downloadpoky-2bbd9a5bbef87a292d63b8305911c2c9d1211d24.tar.gz
poky-2bbd9a5bbef87a292d63b8305911c2c9d1211d24.tar.bz2
poky-2bbd9a5bbef87a292d63b8305911c2c9d1211d24.zip
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
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky-bleeding.conf14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 1ca605aac9..7637a0d2fd 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