handle centrally more variables

diff --git a/Makefile.am b/Makefile.am
index c902f95d2ae811f308b43aa595c3105816a3dc4c..4fb7aa52ee8d1ced9a001902e8932449afe0c269 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ endif
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I src/libopts/m4 -I src/gl/m4
 
 EXTRA_DIST = cfg.mk maint.mk .clcopying
+YEAR=$(shell date +%Y)
 
 dist-hook: 
        make -C doc/ compare-makefile
@@ -50,6 +51,8 @@ dist-hook:
        make ChangeLog
        cp -f ChangeLog $(distdir)/
        sed 's/\@VERSION\@/$(VERSION)/g' -i $(distdir)/src/args-std.def
+       sed 's/\@YEAR\@/$(YEAR)/g' -i $(distdir)/src/args-std.def
+       sed 's/\@PACKAGE_BUGREPORT\@/$(PACKAGE_BUGREPORT)/g' -i $(distdir)/src/args-std.def
        cd $(distdir)/src/ && for i in *.def;do \
                if test x"$$i" = x"args-std.def";then  continue; fi; \
                autogen $$i; \
@@ -62,5 +65,4 @@ dist-hook:
        cd $(distdir)/src/ && for i in *-args.c *-args.h;do \
                mv $$i $$i.bak; \
        done
-       sed 's/\@\@VERSION\@\@/$(VERSION)/g' -i $(distdir)/doc/invoke-*.texi
        touch $(distdir)/doc/*.html $(distdir)/doc/*.pdf $(distdir)/doc/*.info

diff --git a/src/args-std.def b/src/args-std.def
index 99874d4d1fbbd24d0078b2f6cbd0a9c2f333ef23..93634a1857261189ab607804ae7266f1d1d02c81 100644 (file)
--- a/src/args-std.def
+++ b/src/args-std.def
@@ -10,11 +10,11 @@ no-misuse-usage;
 export          = '#include <gettext.h>';
 
 copyright = {
-    date  = "2000-2012";
-    owner = "Free Software Foundation";
+    date  = "2000-@YEAR@";
+    owner = "Free Software Foundation, and others";
     author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; "
-             "see /usr/share/doc/gnutls-bin/AUTHORS for a complete list.";
-    eaddr  = "bugs@gnutls.org";
+             "see /usr/share/doc/gnutls/AUTHORS for a complete list.";
+    eaddr  = "@PACKAGE_BUGREPORT@";
     type  = gpl;
 };