1 files changed, 7 insertions, 7 deletions

diff --git a/build.conf b/build.conf
index 0ad3f72..79c472c 100644
--- a/build.conf
+++ b/build.conf
@@ -15,7 +15,7 @@ set "CXXFLAGS" += "-ggdb -Wall"
 set "CXXFLAGS" += "-pg"
 set "LDFLAGS" += "-pg"
 
-filesIn("src") filter regexp("^src/(.*)\\.h$", "src/bu/{re:1}.h"):
+filesIn("src") filter regexp("^src/(.*)\\.h$", "bu/{re:1}.h"):
         rule "hln",
         group "lnhdrs",
         target file,
@@ -24,7 +24,7 @@ filesIn("src") filter regexp("^src/(.*)\\.h$", "src/bu/{re:1}.h"):
 "libbu++.a":
         rule "lib",
         target file,
-        set "CXXFLAGS" += "-Isrc -fPIC",
+        set "CXXFLAGS" += "-I. -fPIC",
         input filesIn("src") filter regexp("^.*\\.cpp$")
 
 directoriesIn("src/tests","tests/"):
@@ -32,7 +32,7 @@ directoriesIn("src/tests","tests/"):
         target file,
         group "tests",
         requires "libbu++.a",
-        set "CXXFLAGS" += "-Isrc",
+        set "CXXFLAGS" += "-I.",
         set "LDFLAGS" += "-L. -lbu++",
         input filesIn("{fulldir}") filter regexp("^.*\\.cpp$")
 
@@ -41,7 +41,7 @@ filesIn("src/tests") filter regexp("^src/tests/(.*)\\.cpp$", "tests/{re:1}"):
         target file,
         group "tests",
         requires "libbu++.a",
-        set "CXXFLAGS" += "-Isrc",
+        set "CXXFLAGS" += "-I.",
         set "LDFLAGS" += "-L. -lbu++",
         input "src/{target}.cpp"
 
@@ -54,7 +54,7 @@ filesIn("src/unit") filter regexp("^src/unit/(.*)\\.cpp$", "unit/{re:1}"):
         group "tests",
         group "unit",
         requires "libbu++.a",
-        set "CXXFLAGS" += "-Isrc",
+        set "CXXFLAGS" += "-I.",
         set "LDFLAGS" += "-L. -lbu++",
         input "src/{target}.cpp"
 
@@ -80,6 +80,6 @@ rule "cpp":
 
 rule "hln":
         matches regexp("src/(.*)\\.h"),
-        produces "src/bu/{re:1}.h",
-        perform command("ln -s ../{re:1}.h {target}")
+        produces "bu/{re:1}.h",
+        perform command("ln -s ../src/{re:1}.h {target}")