Fix release targets.

diff --git a/cfg.mk b/cfg.mk
index 4ca0fa6..aaa5f56 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -149,16 +149,16 @@ libtasn14win-upload:
        cd windows && make -f libtasn14win.mk upload VERSION=$(VERSION)
 
 source:
-       git tag -u b565716f! -m $(VERSION) $(tag)
+       git tag -u b565716f -m $(VERSION) $(tag)
 
 release-check: syntax-check tarball libtasn14win gendoc-copy gtkdoc-copy coverage coverage-copy clang clang-copy
 
 release-upload-www: gendoc-upload gtkdoc-upload coverage-upload clang-upload
 
 release-upload-ftp:
-       git push
-       git push --tags
        build-aux/gnupload --to ftp.gnu.org:$(PACKAGE) $(distdir).tar.gz
        cp $(distdir).tar.gz $(distdir).tar.gz.sig ../releases/$(PACKAGE)/
+       git push
+       git push --tags
 
 release: release-check release-upload-www source release-upload-ftp libtasn14win-upload

diff --git a/windows/libtasn14win.mk b/windows/libtasn14win.mk
index e82fcde..d832ccf 100644 (file)
--- a/windows/libtasn14win.mk
+++ b/windows/libtasn14win.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
 #
 # This file is part of LIBTASN1.
 #
@@ -47,5 +47,5 @@ doit:
        zip -r ../../$(distdir)-win$(ARCH).zip *
 
 upload:
-       gnupload --to ftp.gnu.org:$(PACKAGE) $(distdir)-win32.zip $(distdir)-win64.zip
+       ../build-aux/gnupload --to ftp.gnu.org:$(PACKAGE) $(distdir)-win32.zip $(distdir)-win64.zip
        cp $(distdir)-win32.zip $(distdir)-win32.zip.sig $(distdir)-win64.zip $(distdir)-win64.zip.sig ../../releases/$(PACKAGE)/