X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/8197afdba8d31d144a204040793e762e1995ec62..dc1cac5fecdf44300c0f840eeff80eb95639d19a:/obsolete-buildroot/make/openssl.mk?ds=inline

diff --git a/obsolete-buildroot/make/openssl.mk b/obsolete-buildroot/make/openssl.mk
index 0e1de34ce..c9726a65a 100644
--- a/obsolete-buildroot/make/openssl.mk
+++ b/obsolete-buildroot/make/openssl.mk
@@ -8,9 +8,10 @@
 OPENSSL_SITE:=http://www.openssl.org/source
 OPENSSL_SOURCE:=openssl-0.9.7d.tar.gz
 OPENSSL_DIR:=$(BUILD_DIR)/openssl-0.9.7d
-OPENSSL_PATCH=$(SOURCE_DIR)/openssl.patch
+OPENSSL_IPK_DIR=$(OPENWRT_IPK_DIR)/openssl
+OPENSSL_PATCH=$(OPENSSL_IPK_DIR)/openssl.patch
 
-OPENSSL_IPK_DIR=$(BUILD_DIR)/openssl-0.9.7d-ipk
+OPENSSL_IPK_BUILD_DIR=$(BUILD_DIR)/openssl-0.9.7d-ipk
 LIBSSL_IPK=$(BUILD_DIR)/libssl_0.9.7d_mipsel.ipk
 
 $(DL_DIR)/$(OPENSSL_SOURCE):
@@ -54,8 +55,8 @@ $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7: $(STAGING_DIR)/lib/libcrypto.a
 	cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/usr/lib/
 	cp -fa $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/usr/lib/
 	#cp -fa $(STAGING_DIR)/bin/openssl  $(TARGET_DIR)/bin/
-	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libssl.so.0.9.7
-	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7
+	-$(STRIP)  $(TARGET_DIR)/usr/lib/libssl.so.0.9.7
+	-$(STRIP)  $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7
 
 $(TARGET_DIR)/usr/lib/libssl.a: $(STAGING_DIR)/lib/libcrypto.a
 	mkdir -p $(TARGET_DIR)/usr/include 
@@ -68,15 +69,15 @@ openssl-headers: $(TARGET_DIR)/usr/lib/libssl.a
 
 openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7
 
-$(LIBSSL_IPK): uclibc $(STAGING_DIR)/usr/lib/libcrypto.so.0.9.7
-	mkdir -p $(OPENSSL_IPK_DIR)/CONTROL
-	cp $(SOURCE_DIR)/libssl.control $(OPENSSL_IPK_DIR)/CONTROL/control
-	mkdir -p $(OPENSSL_IPK_DIR)/usr/lib
-	cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(OPENSSL_IPK_DIR)/usr/lib/
-	cp -fa $(STAGING_DIR)/lib/libssl.so* $(OPENSSL_IPK_DIR)/usr/lib/
-	-$(STRIP) --strip-unneeded $(OPENSSL_IPK_DIR)/usr/lib/libssl.so.0.9.7
-	-$(STRIP) --strip-unneeded $(OPENSSL_IPK_DIR)/usr/lib/libcrypto.so.0.9.7
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSL_IPK_DIR)
+$(LIBSSL_IPK): uclibc $(STAGING_DIR)/lib/libcrypto.a
+	mkdir -p $(OPENSSL_IPK_BUILD_DIR)/CONTROL
+	cp $(OPENSSL_IPK_DIR)/control $(OPENSSL_IPK_BUILD_DIR)/CONTROL/control
+	mkdir -p $(OPENSSL_IPK_BUILD_DIR)/usr/lib
+	cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(OPENSSL_IPK_BUILD_DIR)/usr/lib/
+	cp -fa $(STAGING_DIR)/lib/libssl.so* $(OPENSSL_IPK_BUILD_DIR)/usr/lib/
+	-$(STRIP)  $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libssl.so.0.9.7
+	-$(STRIP)  $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libcrypto.so.0.9.7
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSL_IPK_BUILD_DIR)
 
 openssl-ipk: $(LIBSSL_IPK)
 
@@ -86,6 +87,7 @@ openssl-clean:
 	rm -f $(STAGING_DIR)/bin/openssl  $(TARGET_DIR)/bin/openssl
 	rm -f $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/lib/libcrypto.so*
 	rm -f $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/lib/libssl.so*
+	rm -rf $(OPENSSL_IPK_BUILD_DIR)
 	$(MAKE) -C $(OPENSSL_DIR) clean
 
 openssl-dirclean: