From 8d48c2de74289ad827398b3af834078b86a9f6c6 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 2 Sep 2012 20:20:26 +0200
Subject: [PATCH] backported the short function inclusion

---
 doc/Makefile.am |  3 +--
 doc/gnutls.texi | 42 +++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b3129d47c..ffb77a2c4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -353,13 +353,12 @@ DISTCLEANFILES += $(ENUMS) stamp_enums stamp_functions
 
 stamp_functions: gnutls-api.texi x509-api.texi pgp-api.texi pkcs12-api.texi pkcs11-api.texi abstract-api.texi compat-api.texi dtls-api.texi crypto-api.texi ocsp-api.texi
 	-mkdir functions
-	-mkdir functions.short
 	for i in $^; do \
 		$(srcdir)/scripts/split-texi.pl functions < $$i; \
 	done
 	sed -i 's/\@anchor{.*//g' functions/*
 	sed -i 's/\@subheading.*//g' functions/*
-	cd functions && for i in *;do grep ^"@deftypefun" $$i | sed 's/@deftypefun/@item/g;s/ {/ @var{/;s/ {/ @ref{/' > ../functions.short/$$i;done
+	cd functions && for i in *;do grep ^"@deftypefun" $$i | sed 's/@deftypefun/@item/g;s/ {/ @var{/;s/ {/ @ref{/' > ../functions/$$i.short;done
 	echo $@ > $@
 	$(MAKE) compare-makefile
 
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index bcd03f339..52e427c9c 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -75,52 +75,52 @@ Documentation License''.
 
 @macro showfuncA{ref}
 @table @code
-@include functions.short/\ref\
+@include functions/\ref\.short
 @end table
 @end macro
 
 @macro showfuncB{ref1,ref2}
 @table @code
-@include functions.short/\ref1\
-@include functions.short/\ref2\
+@include functions/\ref1\.short
+@include functions/\ref2\.short
 @end table
 @end macro
 
 @macro showfuncC{ref1,ref2,ref3}
 @table @code
-@include functions.short/\ref1\
-@include functions.short/\ref2\
-@include functions.short/\ref3\
+@include functions/\ref1\.short
+@include functions/\ref2\.short
+@include functions/\ref3\.short
 @end table
 @end macro
 
 @macro showfuncD{ref1,ref2,ref3,ref4}
 @table @code
-@include functions.short/\ref1\
-@include functions.short/\ref2\
-@include functions.short/\ref3\
-@include functions.short/\ref4\
+@include functions/\ref1\.short
+@include functions/\ref2\.short
+@include functions/\ref3\.short
+@include functions/\ref4\.short
 @end table
 @end macro
 
 @macro showfuncE{ref1,ref2,ref3,ref4,ref5}
 @table @code
-@include functions.short/\ref1\
-@include functions.short/\ref2\
-@include functions.short/\ref3\
-@include functions.short/\ref4\
-@include functions.short/\ref5\
+@include functions/\ref1\.short
+@include functions/\ref2\.short
+@include functions/\ref3\.short
+@include functions/\ref4\.short
+@include functions/\ref5\.short
 @end table
 @end macro
 
 @macro showfuncF{ref1,ref2,ref3,ref4,ref5,ref6}
 @table @code
-@include functions.short/\ref1\
-@include functions.short/\ref2\
-@include functions.short/\ref3\
-@include functions.short/\ref4\
-@include functions.short/\ref5\
-@include functions.short/\ref6\
+@include functions/\ref1\.short
+@include functions/\ref2\.short
+@include functions/\ref3\.short
+@include functions/\ref4\.short
+@include functions/\ref5\.short
+@include functions/\ref6\.short
 @end table
 @end macro
 
-- 
2.11.4.GIT