Change searchpath from STAGING_DIR/{include,lib} to STAGING_DIR/usr/{include,lib...

SVN-Revision: 648

diff --git a/openwrt/package/openssl/Makefile b/openwrt/package/openssl/Makefile
index afa5f304e4948ac7315113cc55537d582101f546..c33d412441f666bf16fbbdc7a40b004d5b7d58be 100644 (file)
--- a/openwrt/package/openssl/Makefile
+++ b/openwrt/package/openssl/Makefile
@@ -34,13 +34,17 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
        (cd $(PKG_BUILD_DIR); \
                CFLAGS="-DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5" \
         PATH=$(TARGET_PATH) ./Configure linux-$(ARCH) --prefix=/ \
-               --openssldir=/usr/lib/ssl -L$(STAGING_DIR)/lib -ldl \
-               -I$(STAGING_DIR)/include $(OPENSSL_NO_CIPHERS) \
+               --openssldir=/usr/lib/ssl -L$(STAGING_DIR)/usr/lib -ldl \
+               -I$(STAGING_DIR)/usr/include $(OPENSSL_NO_CIPHERS) \
                shared no-krb5 no-ec no-engine zlib-dynamic no-hw no-threads )
        touch $(PKG_BUILD_DIR)/.configured
 
 $(PKG_BUILD_DIR)/apps/openssl: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -j1 CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) all build-shared
+       $(MAKE)  -C $(PKG_BUILD_DIR) -j1 \
+               CC="$(TARGET_CC)" \
+               AR="$(TARGET_CROSS)ar r" \
+               RANLIB="$(TARGET_CROSS)ranlib" \
+               all build-shared
        # Work around openssl build bug to link libssl.so with libcrypto.so.
        -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
        $(MAKE) -j1 CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) do_linux-shared