Fix from HEAD.

diff --git a/CHANGES b/CHANGES
index 9e9f94dace2090996c4d613065813a275ad8597b..6ec26e04f9b52e651cf3a042818b52caed737d54 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,10 +4,16 @@
 
  Changes between 0.9.8i and 0.9.8j  [xx XXX xxxx]
 
+<<<<<<< CHANGES
+  *) Use correct exit code if there is an error in dgst command.
+     [Steve Henson; problem pointed out by Roland Dirlewanger]
+
+=======
   *) Add JPAKE support, including demo authentication in s_client and
      s_server.
      [Ben Laurie]
 
+>>>>>>> 1.1238.2.123
   *) Set the comparison function in v3_addr_canonize().
      [Rob Austein <sra@hactrn.net>]
 

diff --git a/crypto/jpake/Makefile b/crypto/jpake/Makefile
index 0ed56306f2257b7f113a36ed9288e4fa1e647a60..a4a1402f2ec8650eddd54121036faeb10de39c66 100644 (file)
--- a/crypto/jpake/Makefile
+++ b/crypto/jpake/Makefile
@@ -24,6 +24,14 @@ links:
        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
 
+install:
+       @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+       @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+       do  \
+       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+       done;
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)