aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-25 11:38:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-25 11:38:42 -0400
commitcede7bdcdee25adcc635a0496ece6d7078a094d5 (patch)
treed3ea9cb48086f6fcd561bffe2bc78ffab211ec47
parent38b3d8da1b4f1afab9a70ad6e0482251a6c1f563 (diff)
cabal: Only try to use inotify on Linux.
-rw-r--r--debian/changelog6
-rw-r--r--git-annex.cabal2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 42f37e572..2c289667d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (3.20120625) UNRELEASED; urgency=low
+
+ * cabal: Only try to use inotify on Linux.
+
+ -- Joey Hess <joeyh@debian.org> Mon, 25 Jun 2012 11:38:12 -0400
+
git-annex (3.20120624) unstable; urgency=low
* watch: New subcommand, a daemon which notices changes to
diff --git a/git-annex.cabal b/git-annex.cabal
index 3902a077b..b43705793 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -47,7 +47,7 @@ Executable git-annex
Build-Depends: hS3
CPP-Options: -DWITH_S3
- if flag(Inotify)
+ if os(linux) && flag(Inotify)
Build-Depends: hinotify
CPP-Options: -DWITH_INOTIFY