familiar distro files: make it harder to build unversioned distros and set preference...

diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf
index 7247bdf..dc333a3 100644 (file)
--- a/conf/distro/familiar-0.8.3.conf
+++ b/conf/distro/familiar-0.8.3.conf
@@ -1,4 +1,4 @@
-include conf/distro/familiar.conf
+include conf/distro/familiar-distro.conf
 
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
@@ -17,6 +17,9 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 
+PREFERRED_PROVIDER_virtual/libiconv=glibc
+PREFERRED_PROVIDER_virtual/libintl=glibc
+PREFERRED_PROVIDER_x11=diet-x11
 
 # The CSL compiler is unusable because
 # 1) certain programs stop to compile

diff --git a/conf/distro/familiar.conf b/conf/distro/familiar-distro.conf
similarity index 100%
rename from conf/distro/familiar.conf
rename to conf/distro/familiar-distro.conf