diff options
| author | Martin Lucina <mato@kotelna.sk> | 2010-09-04 17:49:40 +0200 |
|---|---|---|
| committer | Martin Lucina <mato@kotelna.sk> | 2010-09-04 17:49:40 +0200 |
| commit | d4c8de5050a183f4df72062ce3ff6ceca0128fdf (patch) | |
| tree | 3c045e208c1f7f2e06ec55b04be2fe87d7a135ec /Makefile.am | |
| parent | 76f2e5d5442d3200c8ca09681a887830775c84c0 (diff) | |
| parent | 1e8451961e498abd1da61e64f5baf48890e1563e (diff) | |
Merge branch 'maint'
* maint:
Update .gitignore
doc: Add 0MQ version to XHTML11 backend footer
build: Generate ChangeLog in 'make dist', ZIP automatically
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 1236874..09706c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,21 @@ $(top_srcdir)/foreign/xmlParser/xmlParser.cpp \ $(top_srcdir)/foreign/xmlParser/xmlParser.hpp dist-hook: - -cp $(top_srcdir)/builds/redhat/zeromq.spec $(distdir)/zeromq.spec - -sed s/\@PACKAGE_VERSION\@/@PACKAGE_VERSION@/ -i $(distdir)/zeromq.spec - -rm -rf $(distdir)/foreign/openpgm/@pgm_basename@ + @if test -d "$(srcdir)/.git"; \ + then \ + echo Creating ChangeLog && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/config/missing --run git log --stat ) > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + || ( rm -f ChangeLog.tmp ; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo A git clone is required to generate a ChangeLog >&2; \ + fi + -cp $(top_srcdir)/builds/redhat/zeromq.spec $(distdir)/zeromq.spec + -sed s/\@PACKAGE_VERSION\@/@PACKAGE_VERSION@/ -i $(distdir)/zeromq.spec + -rm -rf $(distdir)/foreign/openpgm/@pgm_basename@ distclean-local: - -rm -rf $(top_srcdir)/foreign/openpgm/@pgm_basename@ + -rm -rf $(top_srcdir)/foreign/openpgm/@pgm_basename@ |