← Back to branch summary

~ubuntu-branches/ubuntu/dapper/clamav/dapper-updates

« back to all changes in this revision

Viewing changes to libclamav/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Michael Tautschnig, Michael Tautschnig
  • Date: 2009-11-02 10:24:35 UTC
  • mfrom: (0.11.5 squeeze)
  • mto: (12.1.9 dapper-security)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: james.westby@ubuntu.com-20091102102435-yzkn3jdvo4gank3q
Tags: 0.95.3+dfsg-1
http://bugs.debian.org/537629
http://bugs.debian.org/534443
http://bugs.debian.org/553333
[ Michael Tautschnig ]
* New upstream version
* Should fix clamd segfault on startup (closes: #537629)
* Updated info in clamd.conf man page (closes: #534443)
* Proper socket ownership setup, no chgrp in make_dir (closes: #553333)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/Makefile.am
304
304
version.h.tmp:
305
305
        @test -f version.h || touch version.h;\
306
306
        rm -f $@;\
307
 
        REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
308
 
        if test $$REVISION = "exported"; then\
309
 
                REVISION="$$(LANG=C cd "$(top_srcdir)"; git svn info configure 2>/dev/null| awk '/Revision:/ { print $$2 }' || echo)";\
310
 
                if test -n "$$REVISION"; then\
311
 
                        REVISION="$$REVISION-$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
312
 
                fi;\
 
307
        REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
 
308
        if test $$? -ne 0; then\
 
309
           REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
 
310
           if test "$$REVISION" = "rexported"; then\
 
311
            REVISION="";\
 
312
           fi;\
313
313
        fi;\
314
314
        if test -n "$$REVISION"; then\
315
 
                echo "#define REPO_VERSION \"devel-r$$REVISION\"" >> $@;\
 
315
                echo "#define REPO_VERSION \"devel-$$REVISION\"" >> $@;\
316
316
        else\
317
317
                touch version.h.tmp;\
318
318
        fi