X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=doc%2FMakefile;h=b5fad228f3efd312e6131367e27a29016480cabd;hb=e583bce51c0f1b1b453b73a4edf3c35d0185e66f;hp=a73e2f7b04261094dc41bf5cd1fb457ceee542d7;hpb=5ca751a9eef6ec7a31ac76973d46eac8b48cee52;p=sbcl.git

diff --git a/doc/Makefile b/doc/Makefile
index a73e2f7..b5fad22 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,26 +1,34 @@
 # Makefile for SBCL document generation
 
+# This file is part of the SBCL system. It was copied from UFFI and
+# placed into the public domain by the original author, Kevin
+# Rosenberg.
+
 DOCFILE_BASE_DEFAULT:=user-manual
 DOCFILE_EXT_DEFAULT:=xml
 
-# Standard docfile processing as copied from UFFI
-# Placed into public domain by author Kevin Rosenberg
-
 SYSTEM:=$(shell uname)
 
 ifeq ($(SYSTEM),Linux) 
-  DEBIAN=$()
-  SUSE=
-  REDHAT=
-
   ifneq ($(shell expr "`cat /etc/issue`" : '.*Debian.*'),0)
-    OS:=debian
+    # Old Debian used /usr/share/sgml/docbook, new Debian uses
+    # /usr/share/xml/docbook. 
+    ifneq ($(shell expr "`ls -d /usr/share/xml`" : '.*/usr/share/xml.*'),0)
+      OS:=debian
     else
+      # Evidently it's not a new-style Debian DocBook setup, ergo:
+      OS:=debian-old
+    endif
+  else
     ifneq ($(shell expr "`cat /etc/issue`" : '.*SuSE.*'),0)
       OS=suse
     else   
       ifneq ($(shell expr "`cat /etc/issue`" : 'Red Hat Linux release 9'),0)
         OS=redhat9
+      else   
+        ifneq ($(shell expr "`cat /etc/issue`" : '.*Yarrow.*'),0)
+          OS=fedora1
+        endif
       endif
     endif
   endif
@@ -52,7 +60,7 @@ ifeq ($(XSLTPROC),)
   XSLTPROC:=xsltproc
 endif
 
-CATALOG:=`pwd`/catalog-${OS}.xml
+CATALOG:=`pwd`/catalogs/catalog-${OS}.xml
 CHECK:=XML_CATALOG_FILES="$(CATALOG)" xmllint --noout --xinclude --postvalid $(DOCFILE) || exit 1
 
 .PHONY: all