Tiny patch from ludovic.courtes@laas.fr (Ludovic Courtès).

* doc/Makefile.am: Refer to `sort2.pl' as `$(srcdir)/scripts/sort2.pl'
  instead of `scripts/sort2.pl'.
* doc/manpages/Makefile.am: Refer to `gdoc' as
  `$(top_srcdir)/doc/scripts/gdoc' instead of `../scripts/gdoc'.
* doc/lib/Makefile.am: Likewise.
* doc/lib/x509/Makefile.am: Likewise.
* doc/libextra/Makefile.am: Likewise.
* doc/libextra/openpgp/Makefile.am: Likewise.

6 files changed, 21 insertions, 21 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6c236ad35a..5c723460c8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -81,19 +81,19 @@ AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
 	cd ../libextra && make ia-api.texi
 
 gnutls-api.texi: ../lib/gnutls-api.texi
-	-scripts/sort2.pl < ../lib/gnutls-api.texi > gnutls-api.texi
+	-$(srcdir)/scripts/sort2.pl < ../lib/gnutls-api.texi > gnutls-api.texi
 
 gnutls-extra-api.texi: ../libextra/gnutls-extra-api.texi
-	-scripts/sort2.pl < ../libextra/gnutls-extra-api.texi > gnutls-extra-api.texi
+	-$(srcdir)/scripts/sort2.pl < ../libextra/gnutls-extra-api.texi > gnutls-extra-api.texi
 
 x509-api.texi: ../lib/x509/x509-api.texi
-	-scripts/sort2.pl < ../lib/x509/x509-api.texi > x509-api.texi
+	-$(srcdir)/scripts/sort2.pl < ../lib/x509/x509-api.texi > x509-api.texi
 
 pgp-api.texi: ../libextra/openpgp/pgp-api.texi
-	-scripts/sort2.pl < ../libextra/openpgp/pgp-api.texi > pgp-api.texi
+	-$(srcdir)/scripts/sort2.pl < ../libextra/openpgp/pgp-api.texi > pgp-api.texi
 
 ia-api.texi: ../libextra/ia-api.texi
-	-scripts/sort2.pl < ../libextra/ia-api.texi > ia-api.texi
+	-$(srcdir)/scripts/sort2.pl < ../libextra/ia-api.texi > ia-api.texi
 
 error_codes.texi: ../lib/gnutls_errors.c ../src/errcodes.c
 	-../src/errcodes > error_codes.texi
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 62f6d5b4cc..e1a5c6e159 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -41,7 +41,7 @@ $(APIMANS) $(SRPMANS):
 	make doit
 
 update-makefile:
-	FUNCS=`../scripts/gdoc -listfunc \
+	FUNCS=`$(top_srcdir)/doc/scripts/gdoc -listfunc \
 		$(top_srcdir)/{lib,libextra,lib/x509,libextra/openpgp}/*.c`; \
 	MANS=""; \
 	SRPMANS=""; \
@@ -56,9 +56,9 @@ update-makefile:
 	perl -pi -e "s/^SRPMANS =.*/SRPMANS =$$SRPMANS/" Makefile.am
 
 doit:
-	@for i in `../scripts/gdoc -listfunc $(top_srcdir)/lib/*.c`; do \
+	@for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc $(top_srcdir)/lib/*.c`; do \
 		echo -n "Creating man page for $$i... " && \
-		../scripts/gdoc -man \
+		$(top_srcdir)/doc/scripts/gdoc -man \
 			-module $(PACKAGE) -sourceversion $(VERSION) \
 			-bugsto $(PACKAGE_BUGREPORT) \
 			-include "gnutls/gnutls.h" \
@@ -68,9 +68,9 @@ doit:
 			$(top_srcdir)/lib/*.c >> $$i.3 && \
 		echo "ok"; \
 	done; \
-	for i in `../scripts/gdoc -listfunc $(top_srcdir)/libextra/*.c`; do \
+	for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc $(top_srcdir)/libextra/*.c`; do \
 		echo -n "Creating man page in extra/ for $$i... " && \
-		../scripts/gdoc -man \
+		$(top_srcdir)/doc/scripts/gdoc -man \
 			-module $(PACKAGE) -sourceversion $(VERSION) \
 			-bugsto $(PACKAGE_BUGREPORT) \
 			-include "gnutls/extra.h" \
@@ -80,9 +80,9 @@ doit:
 			$(top_srcdir)/libextra/*.c >> $$i.3 && \
 		echo "ok"; \
 	done; \
-	for i in `../scripts/gdoc -listfunc $(top_srcdir)/lib/x509/*.c | grep -v gnutls_pkcs12`; do \
+	for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc $(top_srcdir)/lib/x509/*.c | grep -v gnutls_pkcs12`; do \
 		echo -n "Creating man page in lib/x509/ for $$i... " && \
-		../scripts/gdoc -man \
+		$(top_srcdir)/doc/scripts/gdoc -man \
 			-module $(PACKAGE) -sourceversion $(VERSION) \
 			-bugsto $(PACKAGE_BUGREPORT) \
 			-include "gnutls/x509.h" \
@@ -92,9 +92,9 @@ doit:
 			$(top_srcdir)/lib/x509/*.c >> $$i.3 && \
 		echo "ok"; \
 	done; \
-	for i in `../scripts/gdoc -listfunc $(top_srcdir)/lib/x509/*.c | grep gnutls_pkcs12`; do \
+	for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc $(top_srcdir)/lib/x509/*.c | grep gnutls_pkcs12`; do \
 		echo -n "Creating man page in lib/x509/ (pkcs12) for $$i... " && \
-		../scripts/gdoc -man \
+		$(top_srcdir)/doc/scripts/gdoc -man \
 			-module $(PACKAGE) -sourceversion $(VERSION) \
 			-bugsto $(PACKAGE_BUGREPORT) \
 			-include "gnutls/pkcs12.h" \
@@ -104,9 +104,9 @@ doit:
 			$(top_srcdir)/lib/x509/*.c >> $$i.3 && \
 		echo "ok"; \
 	done; \
-	for i in `../scripts/gdoc -listfunc $(top_srcdir)/libextra/openpgp/*.c`; do \
+	for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc $(top_srcdir)/libextra/openpgp/*.c`; do \
 		echo -n "Creating man page in libextra/openpgp/ for $$i... " && \
-		../scripts/gdoc -man \
+		$(top_srcdir)/doc/scripts/gdoc -man \
 			-module $(PACKAGE) -sourceversion $(VERSION) \
 			-bugsto $(PACKAGE_BUGREPORT) \
 			-include "gnutls/openpgp.h" \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0c5d415065..2a120e5a02 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -151,7 +151,7 @@ gnutls-api.texi: $(COBJECTS) $(SRP_COBJECTS) $(PSK_COBJECTS)
 	@echo "" > gnutls-api.texi
 	@for i in $(COBJECTS) $(SRP_COBJECTS) $(PSK_COBJECTS); do \
 		echo -n "Creating documentation for file $$i... " && \
-		../doc/scripts/gdoc -texinfo $$i >> gnutls-api.texi && \
+		$(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> gnutls-api.texi && \
 		echo "ok"; \
 	done
 
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index 4acd3ff368..4d0f62a441 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -41,7 +41,7 @@ x509-api.texi: $(libgnutls_x509_la_SOURCES)
 	@echo "" > x509-api.texi
 	@for i in $(libgnutls_x509_la_SOURCES); do \
 		echo -n "Creating documentation for file $$i... " && \
-		../../doc/scripts/gdoc -texinfo $$i >> x509-api.texi && \
+		$(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> x509-api.texi && \
 		echo "ok"; \
 	done
 
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 75b0d89dea..b81b4a1dc2 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -144,7 +144,7 @@ gnutls-extra-api.texi: gnutls_extra.c
 	@echo "" > $@
 	@for i in $<; do \
 		echo -n "Creating documentation for file $$i... " && \
-		../doc/scripts/gdoc -texinfo $$i >> $@ && \
+		$(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> $@ && \
 		echo "ok"; \
 	done
 
@@ -152,7 +152,7 @@ ia-api.texi: gnutls_ia.c
 	@echo "" > $@
 	@for i in $<; do \
 		echo -n "Creating documentation for file $$i... " && \
-		../doc/scripts/gdoc -texinfo $$i >> $@ && \
+		$(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> $@ && \
 		echo "ok"; \
 	done
 
diff --git a/libextra/openpgp/Makefile.am b/libextra/openpgp/Makefile.am
index ae8a807249..dab7e1d409 100644
--- a/libextra/openpgp/Makefile.am
+++ b/libextra/openpgp/Makefile.am
@@ -44,7 +44,7 @@ pgp-api.texi: $(COBJECTS)
 	@echo "" > pgp-api.texi
 	@for i in ../gnutls_openpgp.c $(COBJECTS); do \
 		echo -n "Creating documentation for file $$i... " && \
-		../../doc/scripts/gdoc -texinfo $$i >> pgp-api.texi && \
+		$(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> pgp-api.texi && \
 		echo "ok"; \
 	done