Move the appliance and build scripts into new appliance/ subdirectory.

[libguestfs.git] / src / generator.ml

diff --git a/src/generator.ml b/src/generator.ml
index 9c210bc..03439aa 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -3720,7 +3720,7 @@ int main (int argc, char *argv[])
   srcdir = getenv (\"srcdir\");
   if (!srcdir) srcdir = \".\";
   chdir (srcdir);
-  guestfs_set_path (g, \".\");
+  guestfs_set_path (g, \"appliance\");
 
   filename = \"test1.img\";
   fd = open (filename, O_WRONLY|O_CREAT|O_NOCTTY|O_NONBLOCK|O_TRUNC, 0666);
@@ -6492,11 +6492,16 @@ public class GuestFS {
          doc ^ "\n\n" ^ danger_will_robinson
        else doc in
       let doc = pod2text ~width:60 name doc in
+      let doc = List.map (             (* RHBZ#501883 *)
+       function
+       | "" -> "<p>"
+       | nonempty -> nonempty
+      ) doc in
       let doc = String.concat "\n   * " doc in
 
       pr "  /**\n";
       pr "   * %s\n" shortdesc;
-      pr "   *\n";
+      pr "   * <p>\n";
       pr "   * %s\n" doc;
       pr "   * @throws LibGuestFSException\n";
       pr "   */\n";