X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=doc%2FMakefile;h=0f4e6d141ac277b3f18366ed81e7c0a3f8cea179;hb=398c7bf8d47d979a1879cf67d596c2827a98b0d9;hp=dcdf6a7e2a8aed075179b6db4e90d46c32385020;hpb=d039e5131ac15717049378a664e0e782f32506a2;p=sbcl.git

diff --git a/doc/Makefile b/doc/Makefile
index dcdf6a7..0f4e6d1 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -6,23 +6,29 @@ DOCFILE_EXT_DEFAULT:=xml
 # Standard docfile processing as copied from UFFI
 # Placed into public domain by author Kevin Rosenberg
 
-DEBIAN=$(shell expr "`cat /etc/issue`" : '.*Debian.*')
-SUSE=$(shell expr "`cat /etc/issue`" : '.*SuSE.*')
-REDHAT=$(shell expr "`cat /etc/issue`" : '.*RedHat.*')
-
-
-ifneq (${DEBIAN},0)
-OS:=debian
-else
-  ifneq (${SUSE},0)
-    OS=suse
-  else   
-    ifneq (${REDHAT},0)
-      OS=redhat
+SYSTEM:=$(shell uname)
+
+ifeq ($(SYSTEM),Linux) 
+  ifneq ($(shell expr "`cat /etc/issue`" : '.*Debian.*'),0)
+    OS:=debian
+    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
 endif
 
+ifeq ($(SYSTEM),Darwin)
+  OS:=fink
+endif
 
 ifndef DOCFILE_BASE
 DOCFILE_BASE=${DOCFILE_BASE_DEFAULT}
@@ -46,7 +52,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