Instead of including the local config header into build.h, simply copy the

contents into build.h. This keeps the issues with getting the include paths
right, handling name conflicts, etc to a minimum.

1 files changed, 4 insertions, 1 deletions

diff --git a/misc/config/code/include.pl b/misc/config/code/include.pl
index 8d476545e..398f7e8c7 100644
--- a/misc/config/code/include.pl
+++ b/misc/config/code/include.pl
@@ -64,7 +64,10 @@ END_OF_CONFIG_H
 
    if($local_config ne '')
    {
-       print CONFIG_H "\n#include \"${local_config}\"\n";
+       open LOCAL_CONFIG, "<$local_config" or die
+           "Couldn't read $local_config ($!)\n";
+       print CONFIG_H "\n";
+       while(<LOCAL_CONFIG>) { print CONFIG_H; }
    }
 
    print CONFIG_H "\n#endif\n";