From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 31 Oct 2008 12:09:18 +0000 (+0000)
Subject: Fix from HEAD.
X-Git-Tag: OpenSSL_0_9_8j~57
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=582ef3dbdbd0a633f614d37791226a2fe1558e53;p=oweals%2Fopenssl.git

Fix from HEAD.
---

diff --git a/CHANGES b/CHANGES
index 9e9f94dace..6ec26e04f9 100644
--- 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 0ed56306f2..a4a1402f2e 100644
--- 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)