Re: branching updates

[Ben Pfaff]

John Darrington <address@hidden> writes:

> On Fri, Oct 10, 2008 at 04:06:39PM +0800, john wrote:
>      On Thu, Oct 09, 2008 at 11:08:56PM -0700, Ben Pfaff wrote:
>           
>           After that, I merged the changes from stable into master and
>           updated master.
>           
>           Unfortunately, master doesn't build now:
>                          ../src/language/tests/check-model.q:24:27: error: 
> model-checker.h: No such file or directory
>           John, you moved some model-checker files around, is this related?
>      
>
> A clean "git clone" followed by make -f Smake ; ./configure ; make
> check worked fine for me.

I guess you use the source directory as the build directory.  I
usually don't.  It was specific to the latter.

I pushed the following trivial fix.

commit 81dd94aa39205cf311495cb3239bd4da1503dc2f
Author: Ben Pfaff <address@hidden>
Date:   Sat Oct 11 09:40:41 2008 -0700

    Fix build when build and source directories are separate.

diff --git a/src/language/tests/check-model.q b/src/language/tests/check-model.q
index 2ef5e7b..b1f44ff 100644
--- a/src/language/tests/check-model.q
+++ b/src/language/tests/check-model.q
@@ -21,7 +21,7 @@
 
 #include <errno.h>
 
-#include "model-checker.h"
+#include <language/tests/model-checker.h>
 #include <language/lexer/lexer.h>
 
 #include "error.h"

-- 
On Perl: "It's as if H.P. Lovecraft, returned from the dead and speaking by
seance to Larry Wall, designed a language both elegant and terrifying for his
Elder Things to write programs in, and forgot that the Shoggoths didn't turn
out quite so well in the long run." --Matt Olson