changeset 271:8d47e3001deb

Fix building docs on Debian (potato/woody).
author gthomas
date Wed, 07 Aug 2002 15:10:40 +0000
parents 42332443fea2
children ce611170e194
files packages/ChangeLog packages/pkgconf/rules.doc
diffstat 2 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/packages/ChangeLog
+++ b/packages/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-07  Gary Thomas  <gthomas@ecoscentric.com>
+
+	* pkgconf/rules.doc: The location of the various stylesheets, etc,
+	is quite varied.  Made some changes to let it work on a Debian system,
+	but this should definitely be revisited.
+
 2002-08-06  Jonathan Larmour  <jifl@ecoscentric.com>
 
 	* ecos.db: Include AT91 watchdog driver in at91 target.
--- a/packages/pkgconf/rules.doc
+++ b/packages/pkgconf/rules.doc
@@ -59,13 +59,22 @@
 # have moved around in various releases of the tools.
 ifneq (,$(wildcard /usr/share/sgml/docbook))
   CATALOG	:= /etc/sgml/catalog
-  DSSSL_CATALOG := $(firstword $(wildcard /usr/share/sgml/docbook/dsssl-stylesheets-*/catalog))
+  ifneq (,$(wildcard /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/catalog))
+    DSSSL_CATALOG  := /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/catalog
+  else
+    DSSSL_CATALOG := $(firstword $(wildcard /usr/share/sgml/docbook/dsssl-stylesheets-*/catalog))
+  endif
 else
   ifneq (,$(wildcard /usr/lib/sgml/stylesheets/nwalsh-modular/catalog))
     CATALOG          := /usr/lib/sgml/CATALOG
     DSSSL_CATALOG    := /usr/lib/sgml/stylesheets/nwalsh-modular/catalog
   else
-    Error: unable to locate DocBook tools.
+    ifneq (,$(wildcard /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/sgml.catalog))
+      CATALOG        := /usr/lib/sgml/catalog
+      DSSSL_CATALOG  := /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/sgml.catalog
+    else
+      Error: unable to locate DocBook tools.
+    endif
   endif
 endif
 ECOS_STYLESHEET  := $(TOPLEVEL)/pkgconf/stylesheet.dsl