diff --git a/docker/djgpp/Dockerfile b/docker/djgpp/Dockerfile index 4eae71083..5ab3e773a 100644 --- a/docker/djgpp/Dockerfile +++ b/docker/djgpp/Dockerfile @@ -220,11 +220,11 @@ make -C libdom-0.4.1 install -j1 Q= PREFIX=/usr/local LIBDIR=lib COMPONENT_TYPE= RUN cd /root; \ rm -rf curl-8.4.0; \ wget https://curl.se/download/curl-8.4.0.tar.xz; tar -xf curl-8.4.0.tar.xz -ADD curl.diff /root/curl.diff RUN cd /root/curl-8.4.0; \ -patch -p1 < /root/curl.diff; \ -CFLAGS="-I/usr/local/include" make -j `nproc` -C lib -f Makefile.mk CFG=djgpp CROSSPREFIX=i586-pc-msdosdjgpp- ; \ -install /root/curl-8.4.0/lib/libcurl.a /usr/local/lib/ ; \ +CFLAGS="-I/usr/local/include" make -j `nproc` -C lib -f Makefile.mk CFG=djgpp CROSSPREFIX=i586-pc-msdosdjgpp-; \ +install -m 0644 /root/curl-8.4.0/lib/libcurl.a /usr/local/lib/; \ +install -d /usr/local/include/curl; \ +install -m 0644 /root/curl-8.4.0/include/curl/*.h /usr/local/include/curl/; \ cat < /usr/local/lib/pkgconfig/libcurl.pc prefix=/usr/local exec_prefix=\${prefix} diff --git a/docker/djgpp/curl.diff b/docker/djgpp/curl.diff deleted file mode 100644 index a714983a5..000000000 --- a/docker/djgpp/curl.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- curl-8.4.0/lib/Makefile.mk.ddd 2023-10-29 16:59:33.084171145 +0000 -+++ curl-8.4.0/lib/Makefile.mk 2023-10-29 17:00:29.738097194 +0000 -@@ -424,4 +424,8 @@ - - all: $(OBJ_DIR) $(TARGETS) - -+install: -+ install -d /usr/local/include/curl -+ install -m 0644 $(HHEADERS) /usr/local/include/curl/ -+ install -m 0644 $(libcurl_a_LIBRARY) /usr/local/lib/ - endif