r8172: automated OS discovery

diff --git a/doc/Makefile b/doc/Makefile
index 8d61e2b792c79b186f39b8c8b7ea1132dc1d3ed6..6d44a961bf7ee22145112ae8a051fa7c5b8ffde4 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -15,12 +15,28 @@
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ##############################################################################
 
-OS:=debian
 DOCFILE_BASE_DEFAULT:=uffi
 DOCFILE_EXT_DEFAULT:=xml
 
+
 # Standard docfile processing
 
+DEBIAN=expr "`cat /etc/issue`" : '.*Debian.*'
+SUSE=expr "`cat /etc/issue`" : '.*SuSE.*'
+REDHAT=expr "`cat /etc/issue`" : '.*RedHat.*'
+
+ifneq (${DEBIAN},0)
+OS:=debian
+else
+  ifneq (${SUSE},0)
+    OS=suse
+  else   
+    ifneq (${REDHAT},0)
+      OS=redhat
+    endif
+  endif
+endif
+
 ifndef DOCFILE_BASE
 DOCFILE_BASE=${DOCFILE_BASE_DEFAULT}
 endif

diff --git a/doc/catalog-suse.xml b/doc/catalog-suse.xml
index ed2c958eeb702e837db8886f11943db0503e98e6..6a03830964708712b330b0febbef426f9ab62b39 100644 (file)
--- a/doc/catalog-suse.xml
+++ b/doc/catalog-suse.xml
@@ -29,13 +29,13 @@
 
     <!-- To resolve short stylesheet references -->
     <uri
-        name="docbook.xsl"
+        name="docbook_html.xsl"
         uri="docbook/docbook-xsl/html/docbook.xsl" />
     <uri 
-        name="chunk.xsl"
+        name="docbook_chunk.xsl"
         uri="docbook/docbook-xsl/html/chunk.xsl" />
     <uri
-        name="fo-docbook.xsl"
+        name="docbook_fo.xsl"
         uri="docbook/docbook-xsl/fo/docbook.xsl" />
 
   </group>