Commit 638e93d5 authored by Shaun McCance's avatar Shaun McCance

Moving from gnome-doc-utils to yelp-xsl

parent 5021be47
......@@ -23,6 +23,7 @@ GTK_DOC_CHECK(1.9)
GNOME_DEBUG_CHECK
GNOME_COMPILE_WARNINGS([maximum])
GNOME_MAINTAINER_MODE_DEFINES
MORE_WARN_FLAGS=
DEPRECATION_FLAGS=
......@@ -52,7 +53,7 @@ PKG_CHECK_MODULES(YELP,
gio-2.0
gio-2.0
gio-unix-2.0
gnome-doc-utils >= 0.17.2
yelp-xsl
gtk+-unix-print-2.0
gtk+-2.0 >= 2.16.0
libxml-2.0 >= 2.6.5
......@@ -69,21 +70,21 @@ AC_SUBST([YELP_LIBS])
AC_PATH_PROGS(SED, gsed sed)
XSLT_PATH="`$PKG_CONFIG --variable=xsltdir gnome-doc-utils`"
DB_TITLE="$XSLT_PATH""/docbook/common/db-title.xsl"
AC_SUBST(DB_TITLE)
XSL_PATH="`$PKG_CONFIG --variable=xsltdir yelp-xsl`"
XSL_DB_TITLE="$XSLT_PATH""/docbook/common/db-title.xsl"
AC_SUBST(XSL_DB_TITLE)
DB2HTML="`$PKG_CONFIG --variable=db2xhtml gnome-doc-utils`"
AC_SUBST(DB2HTML)
XSL_DB2XHTML="`$PKG_CONFIG --variable=db2xhtml yelp-xsl`"
AC_SUBST(XSL_DB2XHTML)
MAL2HTML="`$PKG_CONFIG --variable=mal2xhtml gnome-doc-utils`"
AC_SUBST(MAL2HTML)
XSL_MAL2XHTML="`$PKG_CONFIG --variable=mal2xhtml yelp-xsl`"
AC_SUBST(XSL_MAL2XHTML)
GDU_GETTEXT="`$PKG_CONFIG --variable=gettext gnome-doc-utils`"
AC_SUBST(GDU_GETTEXT)
XSL_GETTEXT="`$PKG_CONFIG --variable=gettext yelp-xsl`"
AC_SUBST(XSL_GETTEXT)
GDU_ICON_PATH="`$PKG_CONFIG --variable=icondir gnome-doc-utils`"
AC_SUBST(GDU_ICON_PATH)
YELP_ICON_PATH="`$PKG_CONFIG --variable=icondir yelp-xsl`"
AC_SUBST(YELP_ICON_PATH)
GLIB_GENMARSHAL="`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`"
AC_SUBST(GLIB_GENMARSHAL)
......
......@@ -18,7 +18,7 @@ libyelp_la_SOURCES = \
libyelp_la_CFLAGS = \
$(YELP_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DGDU_ICON_PATH=\"$(GDU_ICON_PATH)\"
-DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\"
libyelp_la_LIBADD = \
$(YELP_LIBS)
......
......@@ -269,14 +269,14 @@ yelp_settings_set_property (GObject *object,
gtk_icon_theme_get_search_path (settings->priv->gtk_icon_theme,
&search_path, &search_path_len);
for (i = search_path_len - 1; i >= 0; i--)
if (g_str_equal (search_path[i], GDU_ICON_PATH)) {
if (g_str_equal (search_path[i], YELP_ICON_PATH)) {
append_search_path = FALSE;
break;
}
g_strfreev (search_path);
if (append_search_path)
gtk_icon_theme_append_search_path (settings->priv->gtk_icon_theme,
GDU_ICON_PATH);
YELP_ICON_PATH);
g_object_ref (settings->priv->gtk_icon_theme);
settings->priv->icon_theme_changed =
g_signal_connect (settings->priv->gtk_icon_theme,
......
......@@ -5,7 +5,7 @@
extension-element-prefixes="yelp"
version="1.0">
<xsl:import href="@DB_TITLE@"/>
<xsl:import href="@XSL_DB_TITLE@"/>
<xsl:template name="node"/>
......
......@@ -5,7 +5,7 @@
extension-element-prefixes="yelp"
version="1.0">
<xsl:import href="@DB2HTML@"/>
<xsl:import href="@XSL_DB2XHTML@"/>
<xsl:include href="yelp-common.xsl"/>
......
......@@ -6,7 +6,7 @@
extension-element-prefixes="yelp"
version="1.0">
<xsl:import href="@MAL2HTML@"/>
<xsl:import href="@XSL_MAL2XHTML@"/>
<xsl:include href="yelp-common.xsl"/>
......
......@@ -5,7 +5,7 @@
extension-element-prefixes="yelp"
version="1.0">
<xsl:import href="@GDU_GETTEXT@"/>
<xsl:import href="@XSL_GETTEXT@"/>
<xsl:param name="help_icon"/>
<xsl:param name="help_icon_size"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment