diff options
| author | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-16 18:08:44 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-16 18:08:44 +0100 |
| commit | 98515732084c6856c2e22364b2ae64113c2c37c6 (patch) | |
| tree | 19aefd5150ecda1b63403b3a8fea3ebcaeed9a7e | |
| parent | a865795a7edfdc939cf3864ca1b7ea9cdc564dc7 (diff) | |
| download | libguestfs-98515732084c6856c2e22364b2ae64113c2c37c6.tar.gz libguestfs-98515732084c6856c2e22364b2ae64113c2c37c6.tar.xz libguestfs-98515732084c6856c2e22364b2ae64113c2c37c6.zip | |
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.
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rwxr-xr-x | src/generator.ml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 292e2ecc..1906378d 100644 --- 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 adcc4ba4..a5086718 100755 --- 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 |