Fix for non-srcdir builds: Run src/generator.ml from the srcdir.

Note that files generated by src/generator.ml are stored in
the srcdir, *not* the builddir.  The reason is so that they
can be included in the tarball and will appear in the srcdir
for tarball builds.

diff --git a/src/Makefile.am b/src/Makefile.am
index 292e2ec..1906378 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,10 +30,10 @@ EXTRA_DIST = \
 noinst_DATA = stamp-generator
 
 stamp-generator: generator.ml
-       mkdir -p $(top_builddir)/perl/lib/Sys
-       mkdir -p $(top_builddir)/ruby/ext/guestfs
-       mkdir -p $(top_builddir)/java/com/redhat/et/libguestfs
-       cd $(top_builddir) && ocaml -warn-error A ./src/$<
+       mkdir -p $(top_srcdir)/perl/lib/Sys
+       mkdir -p $(top_srcdir)/ruby/ext/guestfs
+       mkdir -p $(top_srcdir)/java/com/redhat/et/libguestfs
+       cd $(top_srcdir) && ocaml -warn-error A src/generator.ml
 
 guestfs_protocol.x: stamp-generator
 

diff --git a/src/generator.ml b/src/generator.ml
index adcc4ba..a508671 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -8393,7 +8393,7 @@ let output_to filename =
 let () =
   check_functions ();
 
-  if not (Sys.file_exists "config.status") then (
+  if not (Sys.file_exists "HACKING") then (
     eprintf "\
 You are probably running this from the wrong directory.
 Run it from the top source directory using the command