diff --git a/Makefile b/Makefile index f69929c..e00b3d0 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,11 @@ $(Status)/config: $(Status)/patch touch $(Status)/config $(Status)/patch: $(Status)/clone - cd $(SrcDir)/sshfs && for f in $(PrjDir)/patches/*.patch; do patch --binary -p1 <$$f; done + cd $(SrcDir)/sshfs && \ + for f in $(PrjDir)/patches/*.patch; do \ + patch -p1 <$$f >/dev/null || \ + patch -p1 --binary <$$f; \ + done touch $(Status)/patch $(Status)/clone: diff --git a/README.md b/README.md index 23e7459..6c0ad13 100644 --- a/README.md +++ b/README.md @@ -176,7 +176,7 @@ This is a simple project: In order to build SSHFS-Win you will need Cygwin and the following Cygwin packages: - gcc-core -- git +- git (warning: also having git-for-windows installed in your regular Windows installation can lead to unexpected errors from `git`) - libglib2.0-devel - make - meson