summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fankhauser2020-11-23 20:22:58 +0100
committerAndreas Fankhauser2020-11-23 20:22:58 +0100
commitb6f3ea91b13cd734996c56f82208fe7d96cfe452 (patch)
tree90e9ed0940b37f943110395a2665aebd6b1f8521
parentae353e8a4b9e5852703283528c5187d9fe0e54f7 (diff)
downloadgateleen-resclone-b6f3ea91b13cd734996c56f82208fe7d96cfe452.zip
gateleen-resclone-b6f3ea91b13cd734996c56f82208fe7d96cfe452.tar.gz
Fix build (renames in bin/). Update dependency doc in README.
-rw-r--r--Makefile2
-rw-r--r--README.txt41
2 files changed, 26 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index e1729d5..babf5d9 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@ dist: clean link
build/dist-src/MANIFEST.INI
mkdir build/dist-bin/bin
mv -t build/dist-bin/bin \
- build/bin/gateleenResclone$(BINEXT)
+ build/bin/gateleen-resclone$(BINEXT)
(cd build/dist-bin && find . -type f -exec md5sum -b {} \;) > build/checksums.md5
mv build/checksums.md5 build/dist-bin/checksums.md5
(cd build/dist-bin && tar --owner=0 --group=0 -czf ../../dist/GateleenResclone-$(PROJECT_VERSION)-$(TOOLCHAIN).tgz *)
diff --git a/README.txt b/README.txt
index 95e6d74..f8f32d6 100644
--- a/README.txt
+++ b/README.txt
@@ -45,25 +45,34 @@ From "gateleenResclone --help":
## Dependencies
-- libcurl 7.67.0 "http://curl.haxx.se/libcurl"
-- libyajl 2.1.0 "http://lloyd.github.io/yajl"
-- libarchive 3.3.3 "https://www.libarchive.org/"
+- libcurl 7.67.0 "http://curl.haxx.se/libcurl"
+- libyajl 2.1.0 "http://lloyd.github.io/yajl"
+- libarchive 3.3.3 "https://www.libarchive.org/"
If you prefer to NOT cluttering your system with tons of never again used
packages, you have the option to provide the dependencies from within the
project tree itself. For this, place the files as described below.
-+------------------------------------------------------------------------------
-| external/
-| '- lxGcc64/
-| |- include/
-| | |- curl/
-| | | '- {curl.h, easy.h, multi.h, ...}
-| | |- yajl/
-| | | '- {yajl_gen.h, yajl_parse.h, ...}
-| | |- archive.h
-| | '- archive_entry.h
-| '- lib/
-| '- {libarchive.a, libcurl.a, libyajl.a, libz.a}
-+------------------------------------------------------------------------------
+ external/lxGcc64/
+ |- include/
+ | |- curl/{curl.h, easy.h, multi.h, ...}
+ | |- yajl/{yajl_parse.h, yajl_common.h, ...}
+ | |- archive.h
+ | '- archive_entry.h
+ '- lib/
+ '- {libyajl.so, ...}
+
+Or for windoof:
+
+ external/mingw64/
+ |- rt/bin/
+ | |- pthreadGC2.dll libcurl-4.dll libarchive-13.dll libpcre-1.dll
+ | '- libpcreposix-0.dll libiconv-2.dll
+ |- include/
+ | |- yajl/{yajl_parse.h, yajl_common.h, ...}
+ | |- curl/{curl.h, easy.h, ...}
+ | |- archive.h
+ | |- archive_entry.h
+ | '- pcreposix.h
+ '- lib/{libarchive.a, libarchive.dll.a, libcurl.a, libcurl.dll.a, ...}