diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-10-08 11:24:12 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-10-08 11:24:12 +0000 |
| commit | 48db59fab785ce881e154d83115de86d284fce5d (patch) | |
| tree | 8741bab5dbcca43c884cdf0788b6c0049e0c25d1 /package/libs/cyassl/patches/120-makefile_destdir.patch | |
| parent | 997ace7e5e78d580d802f3f30ddc00f9b30e0bcc (diff) | |
| download | upstream-48db59fab785ce881e154d83115de86d284fce5d.tar.gz upstream-48db59fab785ce881e154d83115de86d284fce5d.tar.bz2 upstream-48db59fab785ce881e154d83115de86d284fce5d.zip | |
move library packages to package/libs/
SVN-Revision: 33657
Diffstat (limited to 'package/libs/cyassl/patches/120-makefile_destdir.patch')
| -rw-r--r-- | package/libs/cyassl/patches/120-makefile_destdir.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/package/libs/cyassl/patches/120-makefile_destdir.patch b/package/libs/cyassl/patches/120-makefile_destdir.patch new file mode 100644 index 0000000000..fe7f508ea2 --- /dev/null +++ b/package/libs/cyassl/patches/120-makefile_destdir.patch @@ -0,0 +1,71 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -10,19 +10,19 @@ basic: + + openssl-links: + cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \ +- ln -s ../src/.libs/libcyassl.a libssl.a; \ +- ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ ++ 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: +- $(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; \ ++ 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 +@@ -647,22 +647,22 @@ basic: + + openssl-links: + cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \ +- ln -s ../src/.libs/libcyassl.a libssl.a; \ +- ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ ++ 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: +- $(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; \ ++ 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: |