From 3f566a60179004c5e957e00fd8c32734c243b5af Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 24 Dec 2007 01:37:05 +0000 Subject: [PATCH] clean up curl installation git-svn-id: svn://svn.openwrt.org/openwrt/packages@9888 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/curl/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/curl/Makefile b/libs/curl/Makefile index d954d449a..519540570 100644 --- 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