aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-09-06 15:35:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-09-06 15:35:13 -0400
commitebb92221fd2d42e360bf24a72b53971129908f01 (patch)
tree9092c81dc28f3485e30621fe4e231bfc0a3e7a3d
parent3778e8897dcd8b2a5a54d076cc5d3a6d0a0bb689 (diff)
Fix Makefile to work with cabal again.
-rw-r--r--Makefile4
-rw-r--r--debian/changelog1
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 20d134714..3f36928af 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,9 @@ Remote/S3.o: Remote/S3.hs
echo "** building without S3 support"; \
fi
-$(bins): $(sources)
+sources: $(sources)
+
+$(bins): sources
$(GHCMAKE) $@
git-annex.1: doc/git-annex.mdwn
diff --git a/debian/changelog b/debian/changelog
index 9ab3b4fd3..973623e20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
git-annex (3.20110903) UNRELEASED; urgency=low
* Improve display of newlines around error and warning messages.
+ * Fix Makefile to work with cabal again.
-- Joey Hess <joeyh@debian.org> Tue, 06 Sep 2011 13:45:16 -0400