summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Feltman <sfeltman@src.gnome.org>2014-01-13 18:53:55 -0800
committerSimon Feltman <sfeltman@src.gnome.org>2014-01-13 18:53:55 -0800
commit5c6f8afed5f6aa05d65d64509a2c9b8041a66b05 (patch)
tree319fb497910a794c410e975548f2b2ddfa66b437
parent056325cba3c86aefcf45ba10f2b7cf86e9fc1800 (diff)
downloadpygobject-5c6f8afed5f6aa05d65d64509a2c9b8041a66b05.tar.gz
Makefile.am: Fix NEWS and ChangeLog generation under vpath builds
Make sure NEWS generation uses top_srcdir to allow "make release-news" to work under a vpath build (directory outside the source tree). Update ChangeLog target to use $(top_srcdir)/missing. This fixes a problem where running "make dist" under a vpath build directory would include an empty ChangeLog.
-rw-r--r--Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 58d720ff..ffcdc6a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,15 +132,15 @@ release-news:
@echo "-------------- 8< -------------"
@echo >> NEWS.tmp
- @cat NEWS >> NEWS.tmp
- @mv NEWS.tmp NEWS
+ @cat $(top_srcdir)/NEWS >> NEWS.tmp
+ @mv NEWS.tmp $(top_srcdir)/NEWS
.PHONY: ChangeLog release-news
ChangeLog:
@echo Creating $@
@if test -d "$(srcdir)/.git"; then \
- (GIT_DIR=$(top_srcdir)/.git ./missing --run git log PYGOBJECT_2_17_0^^.. --stat) | fmt --split-only > $@.tmp \
+ (GIT_DIR=$(top_srcdir)/.git $(top_srcdir)/missing --run git log PYGOBJECT_2_17_0^^.. --stat) | fmt --split-only > $@.tmp \
&& mv -f $@.tmp $@ \
|| ($(RM) $@.tmp; \
echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \