--- gnutls-3.0.23/lib/Makefile.am.orig	2012-09-13 07:41:03 +0400
+++ gnutls-3.0.23/lib/Makefile.am	2012-09-13 07:52:58 +0400
@@ -175,8 +175,8 @@
 endif
 endif
 
-pkix_asn1_tab.c: pkix.asn
-	-asn1Parser pkix.asn pkix_asn1_tab.c
+pkix_asn1_tab.c: $(srcdir)/pkix.asn
+	-asn1Parser $(srcdir)/pkix.asn pkix_asn1_tab.c
 
-gnutls_asn1_tab.c: gnutls.asn
-	-asn1Parser gnutls.asn gnutls_asn1_tab.c
+gnutls_asn1_tab.c: $(srcdir)/gnutls.asn
+	-asn1Parser $(srcdir)/gnutls.asn gnutls_asn1_tab.c
--- gnutls-3.0.23/lib/Makefile.am.orig	2012-09-13 07:54:43 +0400
+++ gnutls-3.0.23/lib/Makefile.am	2012-09-13 08:06:35 +0400
@@ -68,7 +68,9 @@
 	gnutls_auth.c gnutls_v2_compat.c gnutls_datum.c			\
 	gnutls_session_pack.c gnutls_mpi.c gnutls_pk.c gnutls_cert.c	\
 	gnutls_global.c gnutls_constate.c gnutls_anon_cred.c		\
-	pkix_asn1_tab.c gnutls_asn1_tab.c gnutls_mem.c gnutls_ui.c	\
+	$(srcdir)/pkix_asn1_tab.c				\
+	$(srcdir)/gnutls_asn1_tab.c				\
+	gnutls_mem.c gnutls_ui.c					\
 	gnutls_sig.c gnutls_ecc.c gnutls_dh_primes.c gnutls_alert.c	\
 	system.c gnutls_str.c gnutls_state.c gnutls_x509.c		\
 	gnutls_rsa_export.c gnutls_helper.c gnutls_supplemental.c	\
--- gnutls-3.0.23/doc/Makefile.am.orig	2012-09-13 08:27:26 +0400
+++ gnutls-3.0.23/doc/Makefile.am	2012-09-13 08:45:44 +0400
@@ -362,7 +362,7 @@
 
 stamp_enums: enums.texi
 	-mkdir enums
-	$(srcdir)/scripts/split-texi.pl enums enum < enums.texi
+	$(srcdir)/scripts/split-texi.pl enums enum < $(srcdir)/enums.texi
 	echo $@ > $@
 	$(MAKE) compare-makefile
 
@@ -371,7 +371,7 @@
 $(FUNCS): stamp_functions
 
 compare-makefile: enums.texi
-	ENUMS=`grep 'address@hidden ' enums.texi | sed 's/@c //g' | sort`; \
+	ENUMS=`grep 'address@hidden ' $(srcdir)/enums.texi | sed 's/@c //g' | sort`; \
 	STR=""; \
 	for i in $$ENUMS; do \
 		STR="$$STR\nENUMS += enums/$$i"; \
--- gnutls-3.0.23/doc/Makefile.am.orig	2012-09-13 14:11:06 +0400
+++ gnutls-3.0.23/doc/Makefile.am	2012-09-13 16:24:01 +0400
@@ -382,14 +382,14 @@
 		perl -p -e "s,^ENUMS =,ENUMS =$$STR," > tmp-$@; \
 	diff -u $(srcdir)/Makefile.am tmp-$@
 	rm -f tmp-$@
-	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl`; \
+	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h $(top_builddir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl`; \
 	MANS=""; \
 	for i in $$FUNCS; do \
 		MANS="$$MANS\nFUNCS += functions/$$i\nFUNCS += functions/$$i.short"; \
 	done; \
-	grep -v -e '^FUNCS += ' Makefile.am | \
-		perl -p -e "s,^FUNCS =,FUNCS =$$MANS," > tmp-$@; \
-	diff -u $(srcdir)/Makefile.am tmp-$@
+	grep -v -e '^FUNCS += ' $(srcdir)/Makefile.am | \
+		perl -p -e "s,^FUNCS =,FUNCS =$$MANS," | sort > tmp-$@; \
+	sort $(srcdir)/Makefile.am | diff -u - tmp-$@
 	rm -f tmp-$@
 
 .PHONY: compare-makefile