Fix generation of mconfig.h

build/Makefile

@@ -1,3 +1,6 @@
+-include ../mconfig
+-include version.conf
+
 all: ../mconfig includes/mconfig.h
 
 # Look for a suitable build config file and use it.

build/tools/Makefile

@@ -2,5 +2,5 @@ HOSTCXX ?= $(CXX)
 HOSTCXXFLAGS ?= $(CXXFLAGS)
 HOSTLDFLAGS ?= $(LDFLAGS)
 
-mconfig-gen: mconfig-gen.cc ../../mconfig
+mconfig-gen: mconfig-gen.cc
 	$(HOSTCXX) $(HOSTCXXOPTS) -o mconfig-gen mconfig-gen.cc $(HOSTLDFLAGS)