diff options
author | Colin Guthrie <cguthrie@mandriva.org> | 2010-12-04 13:47:43 +0000 |
---|---|---|
committer | Colin Guthrie <cguthrie@mandriva.org> | 2010-12-05 15:59:13 +0000 |
commit | 36f7a408298efd1e3a47a4d62742b5134b80cee9 (patch) | |
tree | b69960684cb7216e037f381edcbee239cc9cd845 | |
parent | 2f67d6b65154e8bb3f4463a9c4c551a6cdae2d46 (diff) |
build-sys: Include the .version file in the distribution tarball
As per the comments in git-version-gen, the .version file that is
typically generated automatically during build should be included
in the tarball, so generate it in the dist-hook.
This fixes a problem when running make distcheck which uses a read-only
source folder and thus cannot generate the $top_srcdir/.version as
part of it's build process (it uses a _build folder which is r/w)
and thus cannot be built.
-rw-r--r-- | Makefile.am | 1 | ||||
-rwxr-xr-x | git-version-gen | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index b8e22eae..a8a9eaac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,6 +77,7 @@ dist-hook: ( git-changelog.perl || echo "git-changelog.perl failed." ) > ${distdir}/ChangeLog 2>&1 ; \ fi echo $(VERSION) > $(distdir)/.tarball-version + echo $(VERSION) > $(distdir)/.version .PHONY: homepage distcleancheck doxygen diff --git a/git-version-gen b/git-version-gen index 1a3d13b9..6181ad92 100755 --- a/git-version-gen +++ b/git-version-gen @@ -67,6 +67,7 @@ scriptversion=2008-04-08.07.01 # echo $(VERSION) > $@-t && mv $@-t $@ # dist-hook: # echo $(VERSION) > $(distdir)/.tarball-version +# echo $(VERSION) > $(distdir)/.version case $# in 1) ;; |