--- a/open-src/font/Makefile.bdf	Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/Makefile.bdf	Mon Nov 22 13:28:12 2010 -0800
@@ -73,37 +73,22 @@
 BUILD_TYPES = core $(BDF_SUBDIR_ENCODINGS)
 BUILD_TYPES_SET = yes
 
-DISABLE_ALL_ENCODINGS = $(ALL_ENCODINGS:%=--disable-%)
 core_ENCODING_CONFIG_OPTS = $(BDF_SUBDIR_ENCODINGS:%=--disable-%)
 
-iso8859-1_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-1=--enable-iso8859-1)
-iso8859-2_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-2=--enable-iso8859-2)
-iso8859-3_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-3=--enable-iso8859-3)
-iso8859-4_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-4=--enable-iso8859-4)
-iso8859-5_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-5=--enable-iso8859-5)
-iso8859-7_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-7=--enable-iso8859-7)
-iso8859-8_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-8=--enable-iso8859-8)
-iso8859-9_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-9=--enable-iso8859-9)
-iso8859-10_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-10=--enable-iso8859-10)
-iso8859-11_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-11=--enable-iso8859-11)
-iso8859-13_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-13=--enable-iso8859-13)
-iso8859-14_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-14=--enable-iso8859-14)
-iso8859-15_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-15=--enable-iso8859-15)
-iso8859-16_ENCODING_CONFIG_OPTS = \
-	$(DISABLE_ALL_ENCODINGS:--disable-iso8859-16=--enable-iso8859-16)
+ iso8859-1_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-1
+ iso8859-2_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-2
+ iso8859-3_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-3
+ iso8859-4_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-4
+ iso8859-5_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-5
+ iso8859-7_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-7
+ iso8859-8_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-8
+ iso8859-9_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-9
+iso8859-10_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-10
+iso8859-11_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-11
+iso8859-13_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-13
+iso8859-14_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-14
+iso8859-15_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-15
+iso8859-16_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-16
 
 
 ENCODED_FONTSUBDIR = $(FONTSUBDIR)-$(BUILD_TYPE:iso%=ISO%)