commit 32fd5df8dbf16574976c372197adc8a2cb7c5c2e parent e3679243671ed7f6422cb8fab0f7986fb8bd32c5 Author: Hiltjo Posthuma <hiltjo@codemadness.org> Date: Sat, 17 May 2014 21:11:00 +0200 curl: install in ./lib like the other libs Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org> Diffstat:
| M | curl/curl.mk | | | 2 | ++ |
| M | curl/depsinc.mk | | | 8 | ++++---- |
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/curl/curl.mk b/curl/curl.mk @@ -44,5 +44,7 @@ curl:QV: # remake static, see: http://curl.haxx.se/mail/archive-2003-03/0115.html rm -f src/curl make LDFLAGS="-all-static $LDFLAGS" + # install in ./lib for use as a dependency. + make install LDFLAGS="-all-static $LDFLAGS" DESTDIR="`pwd`/lib" # remove .la files for now ? find "`pwd`" -iname "*.la" -exec rm {} \; diff --git a/curl/depsinc.mk b/curl/depsinc.mk @@ -1,6 +1,6 @@ <$curl_DEPDIR/v.mk -curl_includedir = $curl_DEPDIR/curl-$v/include -curl_libdir = $curl_DEPDIR/curl-$v/lib/.libs -DEPS_CFLAGS = $DEPS_CFLAGS -I$curl_includedir -DCURL_STATICLIB -DEPS_LDFLAGS = $DEPS_LDFLAGS -L$curl_libdir -lcurl +curl_includedir = $curl_DEPDIR/curl-$v/lib/include +curl_libdir = $curl_DEPDIR/curl-$v/lib/lib +DEPS_CFLAGS = $DEPS_CFLAGS -I${curl_includedir} -DCURL_STATICLIB +DEPS_LDFLAGS = $DEPS_LDFLAGS -L${curl_libdir} -lcurl