diff options
| author | Brian Cameron <bcameron@src.gnome.org> | 2002-07-11 10:15:00 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2002-07-11 10:15:00 +0000 |
| commit | 2593b114c5c0e83e58ed2abdfa234ebe521c75de (patch) | |
| tree | dc8ff55a4b0873e934a4552dc9f76f03eef42ed0 | |
| parent | 8b507ca6c83554c9832bf9814db5a9fd7204d26d (diff) | |
| download | yelp-2593b114c5c0e83e58ed2abdfa234ebe521c75de.tar.gz | |
yelp/configure.in yelp/src/Makefile.am yelp/src/yelp-reader.c Now support
* yelp/configure.in
* yelp/src/Makefile.am
* yelp/src/yelp-reader.c
Now support libgnome installing gnome2-man2html and gnome2-info2html
to libexec.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 9 | ||||
| -rw-r--r-- | src/yelp-reader.c | 18 |
4 files changed, 38 insertions, 9 deletions
@@ -1,3 +1,11 @@ +2002-07-11 Brian Cameron <Brian.Cameron@sun.com> + + * yelp/configure.in + * yelp/src/Makefile.am + * yelp/src/yelp-reader.c + Now support libgnome installing gnome2-man2html and gnome2-info2html + to libexec. + 2002-07-09 Mark McLoughlin <mark@skynet.ie> * yelp.desktop.in: use X-GNOME-DocPath instead of DocPath. diff --git a/configure.in b/configure.in index aa3ac80d..d799a8c7 100644 --- a/configure.in +++ b/configure.in @@ -39,6 +39,18 @@ yelplocaledir='${prefix}/${DATADIRNAME}/locale' AC_SUBST(yelplocaledir) +# libgnome +LIBGNOME_SERVERDIR=`$PKG_CONFIG --variable=libgnome_serverdir libgnome-2.0` +if test x"$LIBGNOME_SERVERDIR" = x; then + LIBGNOME_MAN2HTML="gnome2-man2html" + LIBGNOME_INFO2HTML="gnome2-info2html" +else + LIBGNOME_MAN2HTML="$LIBGNOME_SERVERDIR/gnome2-man2html" + LIBGNOME_INFO2HTML="$LIBGNOME_SERVERDIR/gnome2-info2html" +fi +AC_SUBST(LIBGNOME_MAN2HTML) +AC_SUBST(LIBGNOME_INFO2HTML) + if test "x$prefix" = "xNONE"; then GNOMELOCALEDIR=$ac_default_prefix/share/locale else diff --git a/src/Makefile.am b/src/Makefile.am index 7384a83a..3ad5e772 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,11 @@ INCLUDES = \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DIMAGEDIR=\""$(datadir)/images/yelp"\" \ - -DGNOMELOCALEDIR=\""$(yelplocaledir)"\" + -DGNOMELOCALEDIR=\""$(yelplocaledir)"\" \ + -DLIBGNOME_MAN2HTML=\"$(LIBGNOME_MAN2HTML)\" \ + -DLIBGNOME_INFO2HTML=\"$(LIBGNOME_INFO2HTML)\" \ + -DSERVERDIR=\"$(libexecdir)\" + if HTML_WIDGET_GTKHTML1 html_widget_impl=yelp-html-gtkhtml1.c @@ -15,7 +19,8 @@ else html_widget_impl=yelp-html-gtkhtml2.c endif -bin_PROGRAMS = yelp yelp-db2html +libexec_PROGRAMS = yelp-db2html +bin_PROGRAMS = yelp noinst_PROGRAMS = test-uri test-reader diff --git a/src/yelp-reader.c b/src/yelp-reader.c index 95e958c5..393262ea 100644 --- a/src/yelp-reader.c +++ b/src/yelp-reader.c @@ -239,25 +239,29 @@ reader_convert_start (ReaderThreadData *th_data) switch (yelp_uri_get_type (uri)) { case YELP_URI_TYPE_MAN: - command_line = g_strdup_printf ("gnome2-man2html %s", + command_line = g_strdup_printf ("%s %s", + LIBGNOME_MAN2HTML, yelp_uri_get_path (uri)); break; case YELP_URI_TYPE_INFO: if (yelp_uri_get_section (uri)) { command_line = - g_strdup_printf ("gnome2-info2html %s?%s", - yelp_uri_get_path (uri), - yelp_uri_get_section (uri)); + g_strdup_printf ("%s %s?%s", + LIBGNOME_INFO2HTML, + yelp_uri_get_path (uri), + yelp_uri_get_section (uri)); } else { command_line = - g_strdup_printf ("gnome2-info2html %s", - yelp_uri_get_path (uri)); + g_strdup_printf ("%s %s", + LIBGNOME_INFO2HTML, + yelp_uri_get_path (uri)); } break; case YELP_URI_TYPE_DOCBOOK_XML: case YELP_URI_TYPE_DOCBOOK_SGML: - command_line = g_strdup_printf ("yelp-db2html %s", + command_line = g_strdup_printf ("%s/yelp-db2html %s", + SERVERDIR, yelp_uri_get_path (uri)); break; default: |