summaryrefslogtreecommitdiff
path: root/security/openssl/patches/patch-ad
blob: 7f552227fb45974ab4894c09fc05da65f0fd81ea (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
$NetBSD: patch-ad,v 1.11 2004/03/26 06:54:30 jlam Exp $

--- apps/Makefile.ssl.orig	Thu Aug 14 02:30:31 2003
+++ apps/Makefile.ssl
@@ -100,11 +100,11 @@ install:
 	@for i in $(SCRIPTS); \
 	do  \
 	(echo installing $$i; \
-	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
-	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
-	 done
-	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR); \
-	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
+	 cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/$$i; \
+	 chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/$$i ); \
+	 done;
+	@cp openssl.cnf $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/; \
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/share/examples/openssl/openssl.cnf
 
 tags:
 	ctags $(SRC)
@@ -138,7 +138,7 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).
 	$(RM) $(PROGRAM)
 	LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
 	$(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
-	-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)
+	-(cd ..; LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)
 
 progs.h: progs.pl
 	$(PERL) progs.pl $(E_EXE) >progs.h