fish: Correction for online help for 'edit' and 'more' commands.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a33c91c..2cf03b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/subdir-rules.mk
 ACLOCAL_AMFLAGS = -I m4
 
 # Basic source for the library.
-SUBDIRS = gnulib/lib images src examples po
+SUBDIRS = gnulib/lib images generator src examples po
 
 if ENABLE_DAEMON
 SUBDIRS += daemon
@@ -33,7 +33,7 @@ endif
 SUBDIRS += gnulib/tests capitests regressions test-tool
 
 # Guestfish.
-SUBDIRS += fish 
+SUBDIRS += fish
 
 # Language bindings.
 if HAVE_PERL
@@ -54,6 +54,9 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
+if HAVE_PHP
+SUBDIRS += php
+endif
 
 # Virt-inspector, tools and guestmount.
 if HAVE_INSPECTOR
@@ -68,6 +71,9 @@ if HAVE_FUSE
 SUBDIRS += fuse
 endif
 
+# po-docs must come after tools, inspector.
+SUBDIRS += po-docs
+
 EXTRA_DIST = \
        $(generator_built) \
        html/pod.css \
@@ -181,6 +187,7 @@ all-local:
        grep -v '/guestfs_protocol.c' | \
        grep -v '/rc_protocol.c' | \
        grep -v 'appliance/debian/root' | \
+       grep -v '^po-docs/' | \
        LC_ALL=C sort | \
        sed 's,^\./,,' > po/POTFILES.in
 
@@ -205,9 +212,7 @@ clean-local:
 # is NOT a substitute for proper testing!
 
 quickcheck:
-       LIBGUESTFS_PATH=appliance \
-       test-tool/libguestfs-test-tool \
-         --helper test-tool/libguestfs-test-tool-helper
+       test-tool/run-test-tool-locally
 
 # Mostly static binary distribution.
 #