Fix release target.

diff --git a/.clcopying b/.clcopying
new file mode 100644 (file)
index 0000000..fefbfdb
--- /dev/null
+++ b/.clcopying
@@ -0,0 +1,5 @@
+       ----------------------------------------------------------------------
+       Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+       Copying and distribution of this file, with or without modification,
+       are permitted in any medium without royalty provided the copyright
+       notice and this notice are preserved.

diff --git a/Makefile.am b/Makefile.am
index 1ba11bd..dd99065 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,28 +30,4 @@ SUBDIRS = gl lib src examples tests doc
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 
-ChangeLog:
-       git log --pretty --numstat --summary | git2cl > ChangeLog
-
-htmldir = ../www-gnutls
-tag = $(PACKAGE)_`echo $(VERSION) | sed 's/\./_/g'`
-
-release:
-       ! git-tag -l $(tag) | grep $(PACKAGE) > /dev/null
-       rm -f ChangeLog
-       $(MAKE) ChangeLog distcheck
-       gpg -b $(distdir).tar.gz
-       gpg --verify $(distdir).tar.gz.sig
-       cd doc && ../build-aux/gendocs.sh -o ../$(htmldir)/manual/libtasn1/ $(PACKAGE) "Libtasn1"
-       cp -v doc/reference/html/*.html doc/reference/html/*.png doc/reference/html/*.devhelp doc/reference/html/*.css $(htmldir)/manual/libtasn1/reference/
-       cp -v $(distdir).tar.gz $(distdir).tar.gz.sig $(htmldir)/releases/libtasn1/
-       git commit -m Generated. ChangeLog
-       git-tag -u b565716f! -m $(VERSION) $(tag)
-       git-push --tags
-       git-push
-       scp $(distdir).tar.gz $(distdir).tar.gz.sig igloo.linux.gr:~ftp/pub/gnutls/libtasn1/
-       ssh igloo.linux.gr 'cd ~ftp/pub/gnutls/libtasn1/ && sha1sum *.tar.gz > CHECKSUMS'
-       cd $(htmldir) && \
-               cvs add -kb releases/libtasn1/$(distdir).tar.gz \
-                       releases/libtasn1/$(distdir).tar.gz.sig && \
-               cvs commit -m "Update." manual/libtasn1/ releases/libtasn1/
+EXTRA_DIST = cfg.mk maint.mk .clcopying

diff --git a/cfg.mk b/cfg.mk
index 7af8624..518ccbf 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Free Software Foundation
+# Copyright (C) 2006, 2007, 2008 Free Software Foundation
 # Author: Simon Josefsson
 #
 # This file is part of LIBTASN1.
@@ -32,3 +32,32 @@ W32ROOT ?= $(HOME)/w32root
 
 mingw32: autoreconf 
        ./configure --enable-gtk-doc --host=i586-mingw32msvc --build=`./config.guess` --prefix=$(W32ROOT)
+
+ChangeLog:
+       git2cl > ChangeLog
+       cat .clcopying >> ChangeLog
+
+htmldir = ../www-$(PACKAGE)
+tag = $(PACKAGE)_`echo $(VERSION) | sed 's/\./_/g'`
+
+release: upload webdocs
+
+upload:
+       ! git-tag -l $(tag) | grep $(PACKAGE) > /dev/null
+       rm -f ChangeLog
+       $(MAKE) ChangeLog distcheck
+       git commit -m Generated. ChangeLog
+       git-tag -u b565716f! -m $(VERSION) $(tag)
+       git-push
+       git-push --tags
+       build-aux/gnupload --to ftp.gnu.org:$(PACKAGE) $(distdir).tar.gz
+       scp $(distdir).tar.gz $(distdir).tar.gz.sig igloo.linux.gr:~ftp/pub/gnutls/libtasn1/
+       ssh igloo.linux.gr 'cd ~ftp/pub/gnutls/libtasn1/ && sha1sum *.tar.gz > CHECKSUMS'
+       cp $(distdir).tar.gz $(distdir).tar.gz.sig ../releases/$(PACKAGE)/
+       make webdocs
+
+webdocs:
+       cd doc && ../build-aux/gendocs.sh -o ../$(htmldir)/manual $(PACKAGE) "$(PACKAGE_NAME)"
+       cp -v doc/reference/html/*.html doc/reference/html/*.png doc/reference/html/*.devhelp doc/reference/html/*.css $(htmldir)/reference/
+       cd $(htmldir) && \
+               cvs commit -m "Update." manual/ reference/