Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build documentation #209

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −2
Open

Build documentation #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6f6ddf
[fixup 10a0f75]
daladim Jun 14, 2020
7ea9025
README: added a warning about conflicting Windows/Cygwin programs
daladim Jun 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down