diff --git a/Makefile b/Makefile
index ab38561..17a1b39 100755
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,15 @@
 # $Id$
 
 
+# XSLT processor specific calling templates/functions:
+xalanc = Xalan -p format "'$(4)'" -o $(3) $(1) $(2)
+xalanj = xalan -param format "'$(4)'" $(1) $(2) > $(3)
+saxon = saxon $(1) $(2) format=$(4) > $(3)
+
+# Generic function for runnning the local preferred XSLT processor:
+xslt = $(if $(findstring $(XSLT), 'xalan-c'), $(call xalanc,$(1),$(2),$(3),$(4)), $(if $(findstring $(XSLT), 'xalan-j'), $(call xalanj,$(1),$(2),$(3),$(4)), $(if $(findstring $(XSLT), 'saxon'), $(call saxon,$(1),$(2),$(3),$(4)))))
+
+
 .PHONY: clean
 
 all: xml2html.xsl xml2latex.xsl oracle-docs.xsl
@@ -9,26 +18,10 @@
 	rm -f xml2html.xsl xml2latex.xsl oracle-docs.xsl
 
 xml2html.xsl: format-master.xml xml2xslt.xsl oracle-docs.xsl Makefile
-ifeq ($(XSLT),xalan-c)
-	Xalan -p format "'html'" $< xml2xslt.xsl > $@
-else
-ifeq ($(XSLT),xalan-j)
-	xalan -param format "'html'" $< xml2xslt.xsl > $@
-else
-	saxon $< xml2xslt.xsl format=html > $@
-endif
-endif
+	$(call xslt,$<,xml2xslt.xsl,$@,html)
 
 xml2latex.xsl: format-master.xml xml2xslt.xsl oracle-docs.xsl Makefile
-ifeq ($(XSLT),xalan-c)
-	Xalan -p format "'latex'" $< xml2xslt.xsl > $@
-else
-ifeq ($(XSLT),xalan-j)
-	xalan -param format "'latex'" $< xml2xslt.xsl > $@
-else
-	saxon $< xml2xslt.xsl format=latex > $@
-endif
-endif
+	$(call xslt,$<,xml2xslt.xsl,$@,latex)
 
 oracle-docs.xsl: oracle-docs.perl
 	perl $< '.*' xslt > $@