telepathy-idle: Update telepathy. am from telepathy-gabble to allow out-of-tree distcheck

[Simon McVittie]

Module: telepathy-idle
Branch: master
Commit: 0e60ce6055608eef143cc47446cdca71bc0f4ccc
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=0e60ce6055608eef143cc47446cdca71bc0f4ccc

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Apr 24 15:47:54 2013 +0100

Update telepathy.am from telepathy-gabble to allow out-of-tree distcheck

---

 tools/telepathy.am |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/tools/telepathy.am b/tools/telepathy.am
index 9715026..2b6c430 100644
--- a/tools/telepathy.am
+++ b/tools/telepathy.am
@@ -3,7 +3,7 @@
 dist-hook:
 	chmod u+w ${distdir}/ChangeLog
 	if test -d ${top_srcdir}/.git; then \
-		git log --date=iso $(CHANGELOG_RANGE) > ${distdir}/ChangeLog; \
+		( cd ${top_srcdir} && git log --date=iso $(CHANGELOG_RANGE) ) > ${distdir}/ChangeLog; \
 	fi
 
 distcheck-hook:
@@ -26,11 +26,13 @@ _is-release-check:
 			exit 2; \
 			;; \
 	esac
-	@if ! git diff --no-ext-diff --quiet --exit-code; then \
+	@cd ${top_srcdir} && \
+	if ! git diff --no-ext-diff --quiet --exit-code; then \
 		echo "Hey! Your tree is dirty! No release for you." >&2; \
 		exit 2; \
 	fi
-	@if ! git diff --cached --no-ext-diff --quiet --exit-code; then \
+	@cd ${top_srcdir} && \
+	if ! git diff --cached --no-ext-diff --quiet --exit-code; then \
 		echo "Hey! You have changes staged! No release for you." >&2; \
 		exit 2; \
 	fi
@@ -38,9 +40,16 @@ _is-release-check:
 %.tar.gz.asc: %.tar.gz
 	$(AM_V_GEN)gpg --detach-sign --armor $@
 
- at PACKAGE@- at VERSION@.tar.gz: _is-release-check check distcheck
+ at PACKAGE@- at VERSION@.tar.gz:
+	$(MAKE) _is-release-check
+	$(MAKE) check
+	$(MAKE) distcheck
 
-maintainer-prepare-release: _is-release-check check distcheck release-mail
+maintainer-prepare-release:
+	$(MAKE) _is-release-check
+	$(MAKE) all
+	$(MAKE) distcheck
+	$(MAKE) release-mail
 	git tag -s @PACKAGE at -@VERSION@ -m @PACKAGE@' '@VERSION@
 	gpg --detach-sign --armor @PACKAGE at -@VERSION at .tar.gz
 
@@ -60,7 +69,9 @@ _maintainer-upload-release: _maintainer-upload-release-check
 	rsync -vzP @PACKAGE at -@VERSION at .tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE at -@VERSION at .tar.gz
 	rsync -vzP @PACKAGE at -@VERSION at .tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE at -@VERSION at .tar.gz.asc
 
-maintainer-make-release: maintainer-prepare-release maintainer-upload-release
+maintainer-make-release:
+	$(MAKE) maintainer-prepare-release
+	$(MAKE) maintainer-upload-release
 	@echo "Now:"
 	@echo " • bump the nano-version;"
 	@echo " • push the branch and tags upstream; and"