curl: rename to libcurl so Makefile.autotools.in can find patches

diff --git a/package/Config.in b/package/Config.in
index 5b7dd9ac64e82aa44101809d1eea2ed48dd8a4f5..9569e411a312b3449a407c04e5bc5f64f450fe20 100644 (file)
--- 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 (file)
index 1d6d08e..0000000
--- 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 (file)
index b6d7c08..0000000
--- 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 (file)
index 0000000..1d6d08e
--- /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 (file)
index 0000000..60ed362
--- /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)