Changeset 1470 for trunk/Makefile.am

Timestamp:

Mar 19, 2012, 8:18:49 AM (9 years ago)

Author:

Peter Johansson

Message:

merge patch release 0.9.5 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (2 diffs)

trunk/Makefile.am

@@ -62 +62 @@
 MAINTAINER_CHECK_LOCAL += syntax-check
 # extra check in release rule
-RELEASE_LOCAL = check-svn_revision check-readme
+RELEASE_LOCAL = check-svn_revision check-readme check-openssl
 
-.PHONY: check-svn_revision
+.PHONY: check-svn_revision check-openssl
 
 FORCE:
+
+check-openssl:
+  @openssl version > /dev/null || exit 1
 
 check-svn_revision:
@@ -101 +104 @@
   -e 's|@VERSION[@]|$(VERSION)|g'
 
-build_support/Portfile: $(distdir).tar.gz Makefile build_support/Portfile.in
+build_support/Portfile: $(distdir).tar.gz Makefile build_support/Portfile.in check-openssl
   @rm -f $@ $@.t
-  @openssl version > /dev/null || exit 1
-  @openssl sha1 $(distdir).tar.gz > $(distdir).tar.gz.sha1
+  @openssl sha256 $(distdir).tar.gz > $(distdir).tar.gz.sha256
   @openssl rmd160 $(distdir).tar.gz > $(distdir).tar.gz.rmd160
-  @sha1=`cut -f 2 -d ' ' $(distdir).tar.gz.sha1`;\
+  @sha256=`cut -f 2 -d ' ' $(distdir).tar.gz.sha256`;\
   rmd160=`cut -f 2 -d ' ' $(distdir).tar.gz.rmd160`;\
-  $(edit) -e "s|@SHA1SUM[@]|$$sha1|g" -e "s|@RMD160SUM[@]|$$rmd160|g" \
+  $(edit) -e "s|@SHA256SUM[@]|$$sha256|g" \
+  -e "s|@RMD160SUM[@]|$$rmd160|g" \
   '$(srcdir)/build_support/Portfile.in' > $@.t
   @chmod a-w $@.t