Forward-port r39581 from the 1.6 trunk.

svn path=/trunk/; revision=39582
This commit is contained in:
Gerald Combs 2011-10-25 22:03:54 +00:00
parent 15b6311c01
commit 601198e4fe
1 changed files with 4 additions and 1 deletions

View File

@ -1035,5 +1035,8 @@ checkapi: checkapi_local
dist-hook:
if test -f $(top_srcdir)/version.conf -a ! -f $(top_distdir)/version.conf ; then \
cp $(top_srcdir)/version.conf $(top_distdir); \
echo "is_release: 1" >> $(top_distdir)/version.conf; \
if grep "^is_release: *1" $(top_distdir)/version.conf ; then :; \
else \
echo "is_release: 1" >> $(top_distdir)/version.conf; \
fi ; \
fi