1 files changed, 42 insertions, 20 deletions
diff --git a/package/cyassl/patches/120-makefile_destdir.patch b/package/cyassl/patches/120-makefile_destdir.patch
index 29b0d0a05..bf2027440 100644
--- a/package/cyassl/patches/120-makefile_destdir.patch
+++ b/package/cyassl/patches/120-makefile_destdir.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -8,14 +8,11 @@ basic:
+@@ -10,19 +10,19 @@ basic:
  
  openssl-links:
  	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
@@ -9,21 +9,32 @@
 +	ln -s ../src/.libs/libcyassl.a libssl.a; \
 +	ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../
  
+ #  !!! test -e with a .name like .libs then a * like *dylib fails so just
+ #      look for the .dylib on OS X, and .so otherwise but copy all parts
  install:
--	mkdir ${prefix}/cyassl; \
--    mkdir ${prefix}/cyassl/include; \
--    mkdir ${prefix}/cyassl/include/openssl; \
--    cp include/openssl/*.h ${prefix}/cyassl/include/openssl; \
--    make openssl-links; \
--    mkdir ${prefix}/cyassl/lib; \
--    cp lib/*.a ${prefix}/cyassl/lib
+-	$(mkinstalldirs) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir); \
+-    cp -fpR include/* $(DESTDIR)$(includedir); \
+-    cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir); \
+-    cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \
+-    if test -e src/.libs/libcyassl.a; then \
+-    cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \
+-    if test -e src/.libs/libcyassl.so; then \
+-    cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \
+-    if test -e src/.libs/libcyassl.dylib; then \
+-    cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi;
 +	$(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \
 +	cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \
-+	make openssl-links; \
-+	cp -fpR src/.libs/libcyassl.{a,so*} src/libcyassl.la $(DESTDIR)$(libdir)
++	cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir)/cyassl; \
++	cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \
++	if test -e src/.libs/libcyassl.a; then \
++		cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \
++	if test -e src/.libs/libcyassl.so; then \
++		cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \
++	if test -e src/.libs/libcyassl.dylib; then \
++		cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi;
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -642,17 +642,14 @@ basic:
+@@ -647,22 +647,22 @@ basic:
  
  openssl-links:
  	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
@@ -32,18 +43,29 @@
 +	ln -s ../src/.libs/libcyassl.a libssl.a; \
 +	ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../
  
+ #  !!! test -e with a .name like .libs then a * like *dylib fails so just
+ #      look for the .dylib on OS X, and .so otherwise but copy all parts
  install:
--	mkdir ${prefix}/cyassl; \
--    mkdir ${prefix}/cyassl/include; \
--    mkdir ${prefix}/cyassl/include/openssl; \
--    cp include/openssl/*.h ${prefix}/cyassl/include/openssl; \
--    make openssl-links; \
--    mkdir ${prefix}/cyassl/lib; \
--    cp lib/*.a ${prefix}/cyassl/lib
+-	$(mkinstalldirs) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir); \
+-    cp -fpR include/* $(DESTDIR)$(includedir); \
+-    cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir); \
+-    cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \
+-    if test -e src/.libs/libcyassl.a; then \
+-    cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \
+-    if test -e src/.libs/libcyassl.so; then \
+-    cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \
+-    if test -e src/.libs/libcyassl.dylib; then \
+-    cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi;
 +	$(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \
 +	cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \
-+	make openssl-links; \
-+	cp -fpR src/.libs/libcyassl.{a,so*} src/libcyassl.la $(DESTDIR)$(libdir)
++	cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir)/cyassl; \
++	cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \
++	if test -e src/.libs/libcyassl.a; then \
++		cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \
++	if test -e src/.libs/libcyassl.so; then \
++		cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \
++	if test -e src/.libs/libcyassl.dylib; then \
++		cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi;
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT: