diff options
author | Timotheus Pokorra <timotheus.pokorra@solidcharity.com> | 2014-06-04 10:34:09 +0400 |
---|---|---|
committer | Timotheus Pokorra <timotheus.pokorra@solidcharity.com> | 2014-06-04 10:34:09 +0400 |
commit | 734aab85f3a225a648733436377cdcc5dc0b0a1e (patch) | |
tree | bd6e4a2782bb77b9f87b1f041084452a8f976c74 | |
parent | da0a1fcf837802b82fdeec0ced5122aa751757b9 (diff) |
explicitly generate buildinfo during make dist;
fixing problems with comments in Makefile, caused by my previous commit
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | main/Makefile.am | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -78,6 +78,7 @@ dist: update_submodules remove-stale-tarballs dist-recursive @echo Decompressing monodevelop-$(PACKAGE_VERSION).tar.bz2 @cd tarballs && tar xvjf monodevelop-$(PACKAGE_VERSION).tar.bz2 @cp version.config tarballs/monodevelop-$(PACKAGE_VERSION) + @cd main && make buildinfo @cp main/build/bin/buildinfo tarballs/monodevelop-$(PACKAGE_VERSION)/ @echo Generating merged tarball @cd tarballs && tar -cjf monodevelop-$(PACKAGE_VERSION).tar.bz2 monodevelop-$(PACKAGE_VERSION) diff --git a/main/Makefile.am b/main/Makefile.am index 61e66557d2..5f36eb9c41 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -24,9 +24,9 @@ vcrevision: $(buildinfo): @mkdir -p "$(top_builddir)/build/bin" - # in a tarball, there is a generated buildinfo, which needs to be copied to the right place - # otherwise, the file buildinfo will be generated based on git revision etc. - @if [ -f "$(top_srcdir)/buildinfo" ]; then cp "$(top_srcdir)/buildinfo" "$(top_builddir)/build/bin/buildinfo"; else $(MD_CONFIGURE) gen-buildinfo "$(top_builddir)/build/bin"; fi +# in a tarball, there is a generated buildinfo, which needs to be copied to the right place +# otherwise, the file buildinfo will be generated based on git revision etc. + @if test -f "$(top_srcdir)/buildinfo"; then cp "$(top_srcdir)/buildinfo" "$(top_builddir)/build/bin/buildinfo"; else $(MD_CONFIGURE) gen-buildinfo "$(top_builddir)/build/bin"; fi @echo "Updated build information" @cat $(buildinfo) |