From 3533c874eaf1ab0c51f9d27bbd38b387ec1eed1f Mon Sep 17 00:00:00 2001 From: Laan Tungir Date: Sat, 16 Aug 2025 11:22:44 -0400 Subject: [PATCH] un-nest curl --- build.sh | 10 +++++----- curl-install/bin/curl-config | 4 ++-- curl-install/lib/pkgconfig/libcurl.pc | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index c7aec142..dee44351 100755 --- a/build.sh +++ b/build.sh @@ -422,20 +422,20 @@ build_curl() { fi print_info "Building curl..." - if [ ! -d "curl-8.15.0/curl-8.15.0" ]; then - print_error "curl-8.15.0/curl-8.15.0 source directory not found" + if [ ! -d "curl-8.15.0" ]; then + print_error "curl-8.15.0 source directory not found" exit 1 fi - (cd curl-8.15.0/curl-8.15.0 && \ + (cd curl-8.15.0 && \ ./configure --disable-shared --enable-static \ - --with-openssl="$(pwd)/../../openssl-install" \ + --with-openssl="$(pwd)/../openssl-install" \ --without-libpsl --without-brotli \ --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy \ --disable-dict --disable-telnet --disable-tftp --disable-pop3 \ --disable-imap --disable-smb --disable-smtp --disable-gopher \ --disable-manual \ - --prefix="$(pwd)/../../curl-install" && \ + --prefix="$(pwd)/../curl-install" && \ make -j$(nproc) && \ make install) || { print_error "Failed to build curl"; exit 1; } diff --git a/curl-install/bin/curl-config b/curl-install/bin/curl-config index 9228e7b1..58beca3b 100755 --- a/curl-install/bin/curl-config +++ b/curl-install/bin/curl-config @@ -25,7 +25,7 @@ # shellcheck disable=SC2006 -prefix='/home/teknari/Sync/Programming/VibeCoding/nostr_core_lib/curl-8.15.0/curl-8.15.0/../../curl-install' +prefix='/home/teknari/Sync/Programming/VibeCoding/nostr_core_lib/curl-8.15.0/../curl-install' # Used in 'libdir' # shellcheck disable=SC2034 exec_prefix="${prefix}" @@ -175,7 +175,7 @@ while test "$#" -gt 0; do ;; --configure) - echo " '--disable-shared' '--enable-static' '--with-openssl=/home/teknari/Sync/Programming/VibeCoding/nostr_core_lib/curl-8.15.0/curl-8.15.0/../../openssl-install' '--without-libpsl' '--without-brotli' '--disable-ldap' '--disable-ldaps' '--disable-rtsp' '--disable-proxy' '--disable-dict' '--disable-telnet' '--disable-tftp' '--disable-pop3' '--disable-imap' '--disable-smb' '--disable-smtp' '--disable-gopher' '--disable-manual' '--prefix=/home/teknari/Sync/Programming/VibeCoding/nostr_core_lib/curl-8.15.0/curl-8.15.0/../../curl-install'" + echo " '--disable-shared' '--enable-static' '--with-openssl=/home/teknari/Sync/Programming/VibeCoding/nostr_core_lib/curl-8.15.0/../openssl-install' '--without-libpsl' '--without-brotli' '--disable-ldap' '--disable-ldaps' '--disable-rtsp' '--disable-proxy' '--disable-dict' '--disable-telnet' '--disable-tftp' '--disable-pop3' '--disable-imap' '--disable-smb' '--disable-smtp' '--disable-gopher' '--disable-manual' '--prefix=/home/teknari/Sync/Programming/VibeCoding/nostr_core_lib/curl-8.15.0/../curl-install'" ;; *) diff --git a/curl-install/lib/pkgconfig/libcurl.pc b/curl-install/lib/pkgconfig/libcurl.pc index a4fb814c..c7c22558 100644 --- a/curl-install/lib/pkgconfig/libcurl.pc +++ b/curl-install/lib/pkgconfig/libcurl.pc @@ -22,7 +22,7 @@ # ########################################################################### -prefix=/home/teknari/Sync/Programming/VibeCoding/nostr_core_lib/curl-8.15.0/curl-8.15.0/../../curl-install +prefix=/home/teknari/Sync/Programming/VibeCoding/nostr_core_lib/curl-8.15.0/../curl-install exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include