summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--tools/gnome-doc-utils.make2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e2dee21..5c59c8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-19 Shaun McCance <shaunm@gnome.org>
+
+ * tools/gnome-doc-utils.make:
+ - Don't call scrollkeeper when it's not installed, #410715
+
2007-03-12 Shaun McCance <shaunm@gnome.org>
* configure.in:
diff --git a/tools/gnome-doc-utils.make b/tools/gnome-doc-utils.make
index 5a23229..882b84d 100644
--- a/tools/gnome-doc-utils.make
+++ b/tools/gnome-doc-utils.make
@@ -130,9 +130,11 @@ _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+if ENABLE_SK
_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+endif
################################################################################