clean up curl installation

SVN-Revision: 9888

diff --git a/libs/curl/Makefile b/libs/curl/Makefile
index d954d449af362d8e60f14f1bc72db873ab69ee08..51954057059dc59dc5702fadaf93129e335d33cf 100644 (file)
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@@ -84,16 +84,14 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(2)/bin/
-       $(INSTALL_DIR) $(1)/usr/include
+       $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(1)/usr/bin/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(1)/usr/include/
-       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
        $(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/
-       $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(2)/bin/curl-config
+       $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/curl-config
        $(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/libcurl.pc
+       ln -sf $(1)/usr/bin/curl-config $(2)/bin/
 endef
 
 define Build/UninstallDev