Index: Makefile
===================================================================
--- Makefile	(revision 647)
+++ Makefile	(working copy)
@@ -402,11 +403,8 @@
 
 ### Automatic configuration
 
-# Magic at work, note that you can't use commas in arguments for this
-CONFIG_LINE=@$(SHELL) -c 'echo $(1)' >> $(MAKE_CONFIG) 2> /dev/null
-
 # Create default config from autodetected values
-	-include $(CONFIG_WRITER)
+-include $(CONFIG_WRITER)
 	
 
 # Export all variables set to subprocesses (a bit dirty)
Index: makefiledir/Makefile.config_writer
===================================================================
--- makefiledir/Makefile.config_writer	(revision 647)
+++ makefiledir/Makefile.config_writer	(working copy)
@@ -1,12 +1,15 @@
-# this file generates makefile.config
+# This file generates Makefile.config
 
+# Magic at work, note that you can't use commas in arguments for this
+CONFIG_LINE=@$(SHELL) -c 'echo $(1)' >> $(MAKE_CONFIG) 2> /dev/null
 
+
 $(MAKE_CONFIG):
 	touch $(MAKE_CONFIG)
 	
 	$(call CONFIG_LINE,\# OpenTTD config file for makefile)	
 	$(call CONFIG_LINE,\# Set your options here - 1 for use and empty for disable)
-	$(call CONFIG_LINE,\)
+	$(call CONFIG_LINE,)
 	
 	$(call CONFIG_LINE,\# User setup flags)
 	$(call CONFIG_LINE,\# Translator: adds TODO to any untranslated strings)
@@ -15,13 +18,13 @@
 	$(call CONFIG_LINE,TRANSLATOR:=$(TRANSLATOR))
 	$(call CONFIG_LINE,DISPLAY_WARNINGS:=$(DISPLAY_WARNINGS))
 	$(call CONFIG_LINE,DEBUG:=$(DEBUG))
-	$(call CONFIG_LINE,\)
+	$(call CONFIG_LINE,)
 	
 	$(call CONFIG_LINE,\# Experimental)
 	$(call CONFIG_LINE,WITH_NETWORK:=$(WITH_NETWORK))
 	$(call CONFIG_LINE,WITH_DIRECTMUSIC:=$(WITH_DIRECTMUSIC))
-	$(call CONFIG_LINE,\)
-	$(call CONFIG_LINE,\)	
+	$(call CONFIG_LINE,)
+	$(call CONFIG_LINE,)	
 
 	$(call CONFIG_LINE,\# Everything below this line is autogenerated)
 	$(call CONFIG_LINE,\#)
@@ -29,13 +32,13 @@
 	$(call CONFIG_LINE,\# If that does not fix the problem, you should make a bug report.)
 	$(call CONFIG_LINE,\# It would really help if you could tell how to autodetect the missing setting)
 	$(call CONFIG_LINE,\# That info could be where the missing lib is placed)
-	$(call CONFIG_LINE,\)	
+	$(call CONFIG_LINE,)	
 	
 	$(call CONFIG_LINE,\# Libs)
 	$(call CONFIG_LINE,WITH_ZLIB:=$(WITH_ZLIB))
 	$(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL))
 	$(call CONFIG_LINE,WITH_PNG:=$(WITH_PNG))
-	$(call CONFIG_LINE,\)
+	$(call CONFIG_LINE,)
 	
 	$(call CONFIG_LINE,\# OS flags)
 	$(call CONFIG_LINE,WIN32:=$(WIN32))
@@ -45,12 +48,8 @@
 	$(call CONFIG_LINE,MORPHOS:=$(MORPHOS))
 	$(call CONFIG_LINE,CYGWIN:=$(CYGWIN))
 	$(call CONFIG_LINE,MINGW:=$(MINGW))
-	$(call CONFIG_LINE,\)	
+	$(call CONFIG_LINE,)	
 	
 	$(call CONFIG_LINE,\# misc)
 	$(call CONFIG_LINE,SDL-CONFIG:=$(SDL-CONFIG))
 	$(call CONFIG_LINE,CONFIG_INCLUDED:=yes)
-	
-	
-
-