49 files changed, 13 insertions, 6 deletions
diff --git a/configure.pl b/configure.pl
index bd7e41a3e..9415d5a42 100755
--- a/configure.pl
+++ b/configure.pl
@@ -1582,6 +1582,8 @@ sub read_info_files {
     foreach my $file (dir_list($dir)) {
         my $fullpath = File::Spec->catfile($dir, $file);
 
+        $file =~ s/.txt//;
+
         trace("reading $fullpath");
         %{$allinfo{$file}} = &$func($file, $fullpath);
     }
diff --git a/configure.py b/configure.py
index 676fa11f5..4d923d78e 100755
--- a/configure.py
+++ b/configure.py
@@ -270,7 +270,7 @@ def lex_me_harder(infofile, to_obj, allowed_groups, name_val_pairs):
         else:
             to_obj.parent_module = None
     else:
-        to_obj.basename = basename
+        to_obj.basename = basename.replace('.txt', '')
 
     lexer = shlex.shlex(open(infofile), infofile, posix=True)
     lexer.wordchars += '|:.<>/,-!' # handle various funky chars in info.txt
@@ -883,18 +883,23 @@ def load_info_files(options):
         for (dirpath, dirnames, filenames) in \
                 os.walk(os.path.join(options.build_data, subdir)):
             for filename in filenames:
-                yield os.path.join(dirpath, filename)
+                if filename.endswith('.txt'):
+                    yield os.path.join(dirpath, filename)
 
-    archinfo = dict([(os.path.basename(info), ArchInfo(info))
+    def form_name(filepath):
+        return os.path.basename(filepath).replace('.txt', '')
+
+    archinfo = dict([(form_name(info), ArchInfo(info))
                      for info in list_files_in_build_data('arch')])
 
-    osinfo   = dict([(os.path.basename(info), OsInfo(info))
+    osinfo   = dict([(form_name(info), OsInfo(info))
                       for info in list_files_in_build_data('os')])
 
-    ccinfo = dict([(os.path.basename(info), CompilerInfo(info))
+    ccinfo = dict([(form_name(info), CompilerInfo(info))
                     for info in list_files_in_build_data('cc')])
 
-    del osinfo['defaults'] # FIXME (remove the file)
+    if 'defaults' in osinfo:
+        del osinfo['defaults'] # FIXME (remove the file)
 
     return (modules, archinfo, ccinfo, osinfo)
 
diff --git a/src/build-data/arch/alpha b/src/build-data/arch/alpha.txt
index 60b264396..60b264396 100644
--- a/src/build-data/arch/alpha
+++ b/src/build-data/arch/alpha.txt
diff --git a/src/build-data/arch/amd64 b/src/build-data/arch/amd64.txt
index 216588e7b..216588e7b 100644
--- a/src/build-data/arch/amd64
+++ b/src/build-data/arch/amd64.txt
diff --git a/src/build-data/arch/arm b/src/build-data/arch/arm.txt
index c6be4ad46..c6be4ad46 100644
--- a/src/build-data/arch/arm
+++ b/src/build-data/arch/arm.txt
diff --git a/src/build-data/arch/hitachi-sh b/src/build-data/arch/hitachi-sh.txt
index 8e9f7eee3..8e9f7eee3 100644
--- a/src/build-data/arch/hitachi-sh
+++ b/src/build-data/arch/hitachi-sh.txt
diff --git a/src/build-data/arch/hppa b/src/build-data/arch/hppa.txt
index 4cdd40889..4cdd40889 100644
--- a/src/build-data/arch/hppa
+++ b/src/build-data/arch/hppa.txt
diff --git a/src/build-data/arch/ia32 b/src/build-data/arch/ia32.txt
index aafcf9a77..aafcf9a77 100644
--- a/src/build-data/arch/ia32
+++ b/src/build-data/arch/ia32.txt
diff --git a/src/build-data/arch/ia64 b/src/build-data/arch/ia64.txt
index 7ca84c007..7ca84c007 100644
--- a/src/build-data/arch/ia64
+++ b/src/build-data/arch/ia64.txt
diff --git a/src/build-data/arch/m68k b/src/build-data/arch/m68k.txt
index 27f246abc..27f246abc 100644
--- a/src/build-data/arch/m68k
+++ b/src/build-data/arch/m68k.txt
diff --git a/src/build-data/arch/mips32 b/src/build-data/arch/mips32.txt
index 9846c8fb2..9846c8fb2 100644
--- a/src/build-data/arch/mips32
+++ b/src/build-data/arch/mips32.txt
diff --git a/src/build-data/arch/mips64 b/src/build-data/arch/mips64.txt
index dbb49d028..dbb49d028 100644
--- a/src/build-data/arch/mips64
+++ b/src/build-data/arch/mips64.txt
diff --git a/src/build-data/arch/ppc b/src/build-data/arch/ppc.txt
index 16112f389..16112f389 100644
--- a/src/build-data/arch/ppc
+++ b/src/build-data/arch/ppc.txt
diff --git a/src/build-data/arch/ppc64 b/src/build-data/arch/ppc64.txt
index 6d5eb7ad2..6d5eb7ad2 100644
--- a/src/build-data/arch/ppc64
+++ b/src/build-data/arch/ppc64.txt
diff --git a/src/build-data/arch/s390 b/src/build-data/arch/s390.txt
index 392f51397..392f51397 100644
--- a/src/build-data/arch/s390
+++ b/src/build-data/arch/s390.txt
diff --git a/src/build-data/arch/s390x b/src/build-data/arch/s390x.txt
index 49fb0bda7..49fb0bda7 100644
--- a/src/build-data/arch/s390x
+++ b/src/build-data/arch/s390x.txt
diff --git a/src/build-data/arch/sparc32 b/src/build-data/arch/sparc32.txt
index 6b752df87..6b752df87 100644
--- a/src/build-data/arch/sparc32
+++ b/src/build-data/arch/sparc32.txt
diff --git a/src/build-data/arch/sparc64 b/src/build-data/arch/sparc64.txt
index c0575efc4..c0575efc4 100644
--- a/src/build-data/arch/sparc64
+++ b/src/build-data/arch/sparc64.txt
diff --git a/src/build-data/cc/bcc b/src/build-data/cc/bcc.txt
index df09daff0..df09daff0 100644
--- a/src/build-data/cc/bcc
+++ b/src/build-data/cc/bcc.txt
diff --git a/src/build-data/cc/compaq b/src/build-data/cc/compaq.txt
index 66d3a5219..66d3a5219 100644
--- a/src/build-data/cc/compaq
+++ b/src/build-data/cc/compaq.txt
diff --git a/src/build-data/cc/ekopath b/src/build-data/cc/ekopath.txt
index ca2471059..ca2471059 100644
--- a/src/build-data/cc/ekopath
+++ b/src/build-data/cc/ekopath.txt
diff --git a/src/build-data/cc/gcc b/src/build-data/cc/gcc.txt
index 978ed6d58..978ed6d58 100644
--- a/src/build-data/cc/gcc
+++ b/src/build-data/cc/gcc.txt
diff --git a/src/build-data/cc/hpcc b/src/build-data/cc/hpcc.txt
index 284e92ca6..284e92ca6 100644
--- a/src/build-data/cc/hpcc
+++ b/src/build-data/cc/hpcc.txt
diff --git a/src/build-data/cc/icc b/src/build-data/cc/icc.txt
index 7d8e9682f..7d8e9682f 100644
--- a/src/build-data/cc/icc
+++ b/src/build-data/cc/icc.txt
diff --git a/src/build-data/cc/kai b/src/build-data/cc/kai.txt
index 8585e54e0..8585e54e0 100644
--- a/src/build-data/cc/kai
+++ b/src/build-data/cc/kai.txt
diff --git a/src/build-data/cc/mipspro b/src/build-data/cc/mipspro.txt
index b75fc4fb3..b75fc4fb3 100644
--- a/src/build-data/cc/mipspro
+++ b/src/build-data/cc/mipspro.txt
diff --git a/src/build-data/cc/msvc b/src/build-data/cc/msvc.txt
index 68e4517f8..68e4517f8 100644
--- a/src/build-data/cc/msvc
+++ b/src/build-data/cc/msvc.txt
diff --git a/src/build-data/cc/open64 b/src/build-data/cc/open64.txt
index b7c1e9e99..b7c1e9e99 100644
--- a/src/build-data/cc/open64
+++ b/src/build-data/cc/open64.txt
diff --git a/src/build-data/cc/pgi b/src/build-data/cc/pgi.txt
index 35f466477..35f466477 100644
--- a/src/build-data/cc/pgi
+++ b/src/build-data/cc/pgi.txt
diff --git a/src/build-data/cc/sgipro64 b/src/build-data/cc/sgipro64.txt
index 28132ffcc..28132ffcc 100644
--- a/src/build-data/cc/sgipro64
+++ b/src/build-data/cc/sgipro64.txt
diff --git a/src/build-data/cc/sunwspro b/src/build-data/cc/sunwspro.txt
index e1bc0b26f..e1bc0b26f 100644
--- a/src/build-data/cc/sunwspro
+++ b/src/build-data/cc/sunwspro.txt
diff --git a/src/build-data/cc/xlc b/src/build-data/cc/xlc.txt
index 64b888421..64b888421 100644
--- a/src/build-data/cc/xlc
+++ b/src/build-data/cc/xlc.txt
diff --git a/src/build-data/os/aix b/src/build-data/os/aix.txt
index cec818580..cec818580 100644
--- a/src/build-data/os/aix
+++ b/src/build-data/os/aix.txt
diff --git a/src/build-data/os/beos b/src/build-data/os/beos.txt
index 2b12792bb..2b12792bb 100644
--- a/src/build-data/os/beos
+++ b/src/build-data/os/beos.txt
diff --git a/src/build-data/os/cygwin b/src/build-data/os/cygwin.txt
index c2aadea98..c2aadea98 100644
--- a/src/build-data/os/cygwin
+++ b/src/build-data/os/cygwin.txt
diff --git a/src/build-data/os/darwin b/src/build-data/os/darwin.txt
index 298621216..298621216 100644
--- a/src/build-data/os/darwin
+++ b/src/build-data/os/darwin.txt
diff --git a/src/build-data/os/defaults b/src/build-data/os/defaults.txt
index 5648643a9..5648643a9 100644
--- a/src/build-data/os/defaults
+++ b/src/build-data/os/defaults.txt
diff --git a/src/build-data/os/dragonfly b/src/build-data/os/dragonfly.txt
index 7e3663435..7e3663435 100644
--- a/src/build-data/os/dragonfly
+++ b/src/build-data/os/dragonfly.txt
diff --git a/src/build-data/os/freebsd b/src/build-data/os/freebsd.txt
index ea96b0c88..ea96b0c88 100644
--- a/src/build-data/os/freebsd
+++ b/src/build-data/os/freebsd.txt
diff --git a/src/build-data/os/hpux b/src/build-data/os/hpux.txt
index 6e17d3b73..6e17d3b73 100644
--- a/src/build-data/os/hpux
+++ b/src/build-data/os/hpux.txt
diff --git a/src/build-data/os/irix b/src/build-data/os/irix.txt
index fd8b43287..fd8b43287 100644
--- a/src/build-data/os/irix
+++ b/src/build-data/os/irix.txt
diff --git a/src/build-data/os/linux b/src/build-data/os/linux.txt
index 53528511a..53528511a 100644
--- a/src/build-data/os/linux
+++ b/src/build-data/os/linux.txt
diff --git a/src/build-data/os/mingw b/src/build-data/os/mingw.txt
index eb25017fc..eb25017fc 100644
--- a/src/build-data/os/mingw
+++ b/src/build-data/os/mingw.txt
diff --git a/src/build-data/os/netbsd b/src/build-data/os/netbsd.txt
index 435d8f5e8..435d8f5e8 100644
--- a/src/build-data/os/netbsd
+++ b/src/build-data/os/netbsd.txt
diff --git a/src/build-data/os/openbsd b/src/build-data/os/openbsd.txt
index cb44bd115..cb44bd115 100644
--- a/src/build-data/os/openbsd
+++ b/src/build-data/os/openbsd.txt
diff --git a/src/build-data/os/qnx b/src/build-data/os/qnx.txt
index 28bc8dea9..28bc8dea9 100644
--- a/src/build-data/os/qnx
+++ b/src/build-data/os/qnx.txt
diff --git a/src/build-data/os/solaris b/src/build-data/os/solaris.txt
index 8610b4898..8610b4898 100644
--- a/src/build-data/os/solaris
+++ b/src/build-data/os/solaris.txt
diff --git a/src/build-data/os/tru64 b/src/build-data/os/tru64.txt
index e320c1df4..e320c1df4 100644
--- a/src/build-data/os/tru64
+++ b/src/build-data/os/tru64.txt
diff --git a/src/build-data/os/windows b/src/build-data/os/windows.txt
index a04d609b8..a04d609b8 100644
--- a/src/build-data/os/windows
+++ b/src/build-data/os/windows.txt