diff options
| author | Richard Jones <rjones@redhat.com> | 2009-04-04 12:54:47 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2009-04-04 12:54:47 +0100 |
| commit | 8358ea9524509c02448fe52d5bea205c9c3f869e (patch) | |
| tree | 72a1478994d95bb60951319b4b8006851b7e7567 /fish | |
| parent | 017b503c3bf79ad87cd66f73d36b4be5b31d10ad (diff) | |
| download | libguestfs-8358ea9524509c02448fe52d5bea205c9c3f869e.tar.gz libguestfs-8358ea9524509c02448fe52d5bea205c9c3f869e.tar.xz libguestfs-8358ea9524509c02448fe52d5bea205c9c3f869e.zip | |
LIBGUESTFS_PATH implementation.
Diffstat (limited to 'fish')
| -rw-r--r-- | fish/Makefile.am | 4 | ||||
| -rw-r--r-- | fish/fish.c | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/fish/Makefile.am b/fish/Makefile.am index b8f07ed8..76a2894f 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -21,5 +21,7 @@ guestfish_SOURCES = \ cmds.c \ fish.c \ fish.h -guestfish_CFLAGS = -I$(top_builddir)/src -Wall +guestfish_CFLAGS = \ + -I$(top_builddir)/src -Wall \ + -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' guestfish_LDADD = $(top_builddir)/src/libguestfs.la diff --git a/fish/fish.c b/fish/fish.c index 5de84bc9..0fc14ce1 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -117,6 +117,14 @@ main (int argc, char *argv[]) guestfs_set_autosync (g, 1); + /* If developing, add . to the path. Note that libtools interferes + * with this because uninstalled guestfish is a shell script that runs + * the real program with an absolute path. Detect that too. + */ + if (argv[0] && + (argv[0][0] != '/' || strstr (argv[0], "/.libs/lt-") != NULL)) + guestfs_set_path (g, ".:" GUESTFS_DEFAULT_PATH); + for (;;) { c = getopt_long (argc, argv, options, long_options, NULL); if (c == -1) break; |