1 | --- a/Makefile.am |
2 | +++ b/Makefile.am |
3 | @@ -10,19 +10,19 @@ basic: |
4 | |
5 | openssl-links: |
6 | cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \ |
7 | - ln -s ../src/.libs/libcyassl.a libssl.a; \ |
8 | - ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ |
9 | + ln -s ../src/.libs/libcyassl.a libssl.a; \ |
10 | + ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ |
11 | |
12 | # !!! test -e with a .name like .libs then a * like *dylib fails so just |
13 | # look for the .dylib on OS X, and .so otherwise but copy all parts |
14 | install: |
15 | - $(mkinstalldirs) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir); \ |
16 | - cp -fpR include/* $(DESTDIR)$(includedir); \ |
17 | - cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir); \ |
18 | - cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \ |
19 | - if test -e src/.libs/libcyassl.a; then \ |
20 | - cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \ |
21 | - if test -e src/.libs/libcyassl.so; then \ |
22 | - cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \ |
23 | - if test -e src/.libs/libcyassl.dylib; then \ |
24 | - cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi; |
25 | + $(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \ |
26 | + cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \ |
27 | + cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir)/cyassl; \ |
28 | + cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \ |
29 | + if test -e src/.libs/libcyassl.a; then \ |
30 | + cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \ |
31 | + if test -e src/.libs/libcyassl.so; then \ |
32 | + cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \ |
33 | + if test -e src/.libs/libcyassl.dylib; then \ |
34 | + cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi; |
35 | --- a/Makefile.in |
36 | +++ b/Makefile.in |
37 | @@ -647,22 +647,22 @@ basic: |
38 | |
39 | openssl-links: |
40 | cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \ |
41 | - ln -s ../src/.libs/libcyassl.a libssl.a; \ |
42 | - ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ |
43 | + ln -s ../src/.libs/libcyassl.a libssl.a; \ |
44 | + ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ |
45 | |
46 | # !!! test -e with a .name like .libs then a * like *dylib fails so just |
47 | # look for the .dylib on OS X, and .so otherwise but copy all parts |
48 | install: |
49 | - $(mkinstalldirs) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir); \ |
50 | - cp -fpR include/* $(DESTDIR)$(includedir); \ |
51 | - cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir); \ |
52 | - cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \ |
53 | - if test -e src/.libs/libcyassl.a; then \ |
54 | - cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \ |
55 | - if test -e src/.libs/libcyassl.so; then \ |
56 | - cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \ |
57 | - if test -e src/.libs/libcyassl.dylib; then \ |
58 | - cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi; |
59 | + $(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \ |
60 | + cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \ |
61 | + cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir)/cyassl; \ |
62 | + cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \ |
63 | + if test -e src/.libs/libcyassl.a; then \ |
64 | + cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \ |
65 | + if test -e src/.libs/libcyassl.so; then \ |
66 | + cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \ |
67 | + if test -e src/.libs/libcyassl.dylib; then \ |
68 | + cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi; |
69 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
70 | # Otherwise a system limit (for SysV at least) may be exceeded. |
71 | .NOEXPORT: |
72 | |