non-srcdir build fixes

* guile-tools.in: Fix the checks to account for non-srcdir builds.

* libguile/frames.c:
* libguile/objcodes.c:
* libguile/programs.c:
* libguile/instructions.c:
* libguile/vm.c: Fix snarf-includes to cope with non-srcdir builds.

* libguile/instructions.h:
* libguile/instructions.c: Fix the stubs inclusion to be non-srcdir
  compatible.

* libguile/vm-expand.h (VM_DEFINE_INSTRUCTION): Fix some things so as not
  to require the instructions.h defintitions, since we have the codes
  already. Not important tho :)

* pre-inst-guile-env.in: Minor tweak that should have no effect.

* test-suite/standalone/Makefile.am (all-local): Remove a chmod +x step,
  the configure.ac rule should do that if necessary.

1 files changed, 5 insertions, 5 deletions

diff --git a/libguile/instructions.c b/libguile/instructions.c
index a19b158dc..b33c8d203 100644
--- a/libguile/instructions.c
+++ b/libguile/instructions.c
@@ -79,10 +79,10 @@ fetch_instruction_table ()
       table = malloc (bytes);
       memset (table, 0, bytes);
 #define VM_INSTRUCTION_TO_TABLE 1
-#include "vm-expand.h"
-#include "vm-i-system.i"
-#include "vm-i-scheme.i"
-#include "vm-i-loader.i"
+#include <libguile/vm-expand.h>
+#include <libguile/vm-i-system.i>
+#include <libguile/vm-i-scheme.i>
+#include <libguile/vm-i-loader.i>
 #undef VM_INSTRUCTION_TO_TABLE
       for (i = 0; i < scm_op_last; i++)
         {
@@ -223,7 +223,7 @@ scm_init_instructions (void)
   scm_bootstrap_vm ();
 
 #ifndef SCM_MAGIC_SNARFER
-#include "instructions.x"
+#include "libguile/instructions.x"
 #endif
 }