Fix builddir != srcdir builds.

diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 5977819e71d83562b1d85c2bd29ddb17887ad034..f58200837f0dbcc88e2e34c63c9b4f542fb613a1 100644 (file)
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -770,14 +770,14 @@ update-makefile:
 
 doit:
        @echo -n "Creating man pages for gnutls.h..." && \
-       for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/gnutls.h`; do \
+       for i in `$(top_srcdir)/doc/scripts/getfuncs.pl <$(top_srcdir)/lib/includes/gnutls/gnutls.h.in`; do \
                $(top_srcdir)/doc/scripts/gdoc -man \
                        -module $(PACKAGE) -sourceversion $(VERSION) \
                        -bugsto $(PACKAGE_BUGREPORT) \
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/gnutls.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2012 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation, Inc." \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \
                echo -n "."; \
@@ -791,7 +791,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/compat.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2012 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation, Inc." \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \
                echo -n "."; \
@@ -805,7 +805,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/x509.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2012 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation, Inc." \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \
                echo -n "."; \
@@ -819,7 +819,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/ocsp.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2012 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation, Inc." \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \
                echo -n "."; \
@@ -833,7 +833,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/abstract.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2012 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation, Inc." \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \
                echo -n "."; \
@@ -847,7 +847,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/pkcs12.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2012 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation, Inc." \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \
                echo -n "."; \
@@ -861,7 +861,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/pkcs11.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2012 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation, Inc." \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \
                echo -n "."; \
@@ -875,7 +875,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/dtls.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2012 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation, Inc." \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \
                echo -n "."; \
@@ -889,7 +889,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/openpgp.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2012 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation, Inc." \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \
                echo -n "."; \
@@ -903,7 +903,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/crypto.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2012 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation, Inc." \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 2>/dev/null && \
                echo -n "."; \

diff --git a/src/Makefile.am b/src/Makefile.am
index db1c63dc4c705ccf900b25e8d2a9220e8822444d..5335b1bc6b7b74402c885f08d67c555f6f9af81e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -134,18 +134,18 @@ libcmd_p11tool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB)
 endif # ENABLE_PKCS11
 
 ocsptool-args.c: $(srcdir)/ocsptool-args.def.in
-       -autogen $(srcdir)/ocsptool-args.def
+       -autogen ocsptool-args.def
 p11tool-args.c: $(srcdir)/p11tool-args.def.in
-       -autogen $(srcdir)/p11tool-args.def
+       -autogen p11tool-args.def
 psk-args.c: $(srcdir)/psk-args.def.in
-       -autogen $(srcdir)/psk-args.def
+       -autogen psk-args.def
 cli-debug-args.c: $(srcdir)/cli-debug-args.def.in
-       -autogen $(srcdir)/cli-debug-args.def
+       -autogen cli-debug-args.def
 cli-args.c: $(srcdir)/cli-args.def.in
-       -autogen $(srcdir)/cli-args.def
+       -autogen cli-args.def
 serv-args.c: $(srcdir)/serv-args.def.in
-       -autogen $(srcdir)/serv-args.def
+       -autogen serv-args.def
 srptool-args.c: $(srcdir)/srptool-args.def.in
-       -autogen $(srcdir)/srptool-args.def
+       -autogen srptool-args.def
 certtool-args.c: $(srcdir)/certtool-args.def.in
-       -autogen $(srcdir)/certtool-args.def
+       -autogen certtool-args.def