aboutsummaryrefslogtreecommitdiffstats
path: root/package/libcurl
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-02-07 12:35:05 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2013-02-08 22:34:26 +0100
commita5ce8576748421b6dece97a665e575d7dfc9fbe8 (patch)
treed872f865298312833109804f95d5355fc919efc7 /package/libcurl
parent580225af20b6c692da76eb43b20382a47b3ed170 (diff)
downloadbuildroot-novena-a5ce8576748421b6dece97a665e575d7dfc9fbe8.tar.gz
buildroot-novena-a5ce8576748421b6dece97a665e575d7dfc9fbe8.zip
package: use <pkg>_CONFIG_SCRIPTS wherever possible
Use the <pkg>_CONFIG_SCRIPTS mechanism in all packages for which it does all what the package was doing. A few packages, like libxslt, are for now left out, since they need some additional fixup (for example a fixup of includedir). Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/libcurl')
-rw-r--r--package/libcurl/libcurl.mk11
1 files changed, 4 insertions, 7 deletions
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index fd00694b3..38ca854b2 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -11,6 +11,7 @@ LIBCURL_LICENSE = ICS
LIBCURL_LICENSE_FILES = COPYING
LIBCURL_INSTALL_STAGING = YES
LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols
+LIBCURL_CONFIG_SCRIPTS = curl-config
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBCURL_DEPENDENCIES += openssl
@@ -30,16 +31,12 @@ define LIBCURL_FIX_DOT_PC
endef
LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_OPENSSL),LIBCURL_FIX_DOT_PC)
+ifeq ($(BR2_PACKAGE_CURL),)
define LIBCURL_TARGET_CLEANUP
- rm -rf $(TARGET_DIR)/usr/bin/curl-config \
- $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)
+ rm -rf $(TARGET_DIR)/usr/bin/curl
endef
LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP
-
-define LIBCURL_STAGING_FIXUP_CURL_CONFIG
- $(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/curl-config
-endef
-LIBCURL_POST_INSTALL_STAGING_HOOKS += LIBCURL_STAGING_FIXUP_CURL_CONFIG
+endif
$(eval $(autotools-package))