From f4631f0a170b26b4a8364aa8706475f304f5f824 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Sun, 11 Mar 2012 16:11:08 +0100 Subject: Add Darwin/OS X specific information to man page * Volumes are unmounted using "umount" not "fusermount" * idmap=user is the deafault setting on Darwin/OS X --- Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index a80788b..b43956c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,10 +12,13 @@ sshfs_CFLAGS = $(SSHFS_CFLAGS) sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=26 -DLIBDIR=\"$(libdir)\" EXTRA_DIST = sshnodelay.c FAQ.txt -CLEANFILES = sshnodelay.so +CLEANFILES = sshnodelay.so sshfs.1 dist_man_MANS = sshfs.1 +sshfs.1: + $(CPP) $(CPPFLAGS) -P -xassembler-with-cpp sshfs.1.in | sed -e '/^$$/d' > sshfs.1 + if SSH_NODELAY_SO all-local: sshnodelay.so -- cgit v1.2.3 From 14581937282486ab7ce057ec79f226181ef1d45d Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Tue, 8 Jan 2013 14:53:09 +0100 Subject: Add unnamed semaphore implementation for Mac OS X In the past we relied on libosxfuse including a working unnamed semaphore implmentation for Mac OS X. This will not be the case in future releases of OSXFUSE, therefore we need to add our own implementation. --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index b43956c..078b2b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,9 @@ sshfs_SOURCES = sshfs.c cache.c cache.h if FUSE_OPT_COMPAT sshfs_SOURCES += compat/fuse_opt.c compat/fuse_opt.h endif +if DARWIN_COMPAT +sshfs_SOURCES += compat/darwin_compat.c compat/darwin_compat.h +endif sshfs_LDADD = $(SSHFS_LIBS) sshfs_CFLAGS = $(SSHFS_CFLAGS) -- cgit v1.2.3