From 615528ba939d4c54f3b7630b6422496b38482549 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 28 Dec 2008 20:00:07 +0000 Subject: curl: rename to libcurl so Makefile.autotools.in can find patches --- package/Config.in | 2 +- package/curl/Config.in | 13 ------------- package/curl/curl.mk | 17 ----------------- package/libcurl/Config.in | 13 +++++++++++++ package/libcurl/libcurl.mk | 17 +++++++++++++++++ 5 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 package/curl/Config.in delete mode 100644 package/curl/curl.mk create mode 100644 package/libcurl/Config.in create mode 100644 package/libcurl/libcurl.mk diff --git a/package/Config.in b/package/Config.in index 5b7dd9ac6..9569e411a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -133,7 +133,6 @@ source "package/boa/Config.in" endif source "package/bind/Config.in" source "package/bridge-utils/Config.in" -source "package/curl/Config.in" if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS source "package/dhcp/Config.in" endif @@ -152,6 +151,7 @@ source "package/kismet/Config.in" source "package/l2tp/Config.in" source "package/libcgi/Config.in" source "package/libcgicc/Config.in" +source "package/libcurl/Config.in" source "package/libeXosip2/Config.in" source "package/libosip2/Config.in" source "package/libpcap/Config.in" diff --git a/package/curl/Config.in b/package/curl/Config.in deleted file mode 100644 index 1d6d08e68..000000000 --- a/package/curl/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBCURL - bool "libcurl" - help - cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, - and Dict servers, using any of the supported protocols. - - http://curl.haxx.nu/ - -config BR2_PACKAGE_CURL - bool "curl binary" - depends on BR2_PACKAGE_LIBCURL - help - Install curl binary as well diff --git a/package/curl/curl.mk b/package/curl/curl.mk deleted file mode 100644 index b6d7c08da..000000000 --- a/package/curl/curl.mk +++ /dev/null @@ -1,17 +0,0 @@ -############################################################# -# -# curl -# -############################################################# -LIBCURL_VERSION = 7.19.2 -LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 -LIBCURL_SITE = http://curl.haxx.se/download/ -LIBCURL_INSTALL_STAGING = YES -LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \ - $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6) - -$(eval $(call AUTOTARGETS,package,libcurl)) - -$(LIBCURL_HOOK_POST_INSTALL): - rm -rf $(TARGET_DIR)/usr/bin/curl-config \ - $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl) diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in new file mode 100644 index 000000000..1d6d08e68 --- /dev/null +++ b/package/libcurl/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBCURL + bool "libcurl" + help + cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, + and Dict servers, using any of the supported protocols. + + http://curl.haxx.nu/ + +config BR2_PACKAGE_CURL + bool "curl binary" + depends on BR2_PACKAGE_LIBCURL + help + Install curl binary as well diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk new file mode 100644 index 000000000..60ed3623d --- /dev/null +++ b/package/libcurl/libcurl.mk @@ -0,0 +1,17 @@ +############################################################# +# +# libcurl +# +############################################################# +LIBCURL_VERSION = 7.19.2 +LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 +LIBCURL_SITE = http://curl.haxx.se/download/ +LIBCURL_INSTALL_STAGING = YES +LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \ + $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6) + +$(eval $(call AUTOTARGETS,package,libcurl)) + +$(LIBCURL_HOOK_POST_INSTALL): + rm -rf $(TARGET_DIR)/usr/bin/curl-config \ + $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl) -- cgit v1.2.3