[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit c92168612632b891f345ad936fc40a5e27d792b7
Author: Török Edvin <edwin at clamav.net>
Date:   Thu Oct 1 16:18:32 2009 +0300

    Fix build when git is not installed and using BSD make.

diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am
index 2589972..9710937 100644
--- a/libclamav/Makefile.am
+++ b/libclamav/Makefile.am
@@ -346,8 +346,8 @@ version.h: version.h.tmp
 version.h.tmp:
 	@test -f version.h || touch version.h;\
 	rm -f $@;\
-	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
-	if test $$? -ne 0; then\
+	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null || echo "exported")";\
+	if test "$$REVISION" = "exported"; then\
 	   REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
 	   if test "$$REVISION" = "rexported"; then\
 	    REVISION="";\
diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in
index b152975..bb018c6 100644
--- a/libclamav/Makefile.in
+++ b/libclamav/Makefile.in
@@ -2028,8 +2028,8 @@ version.h: version.h.tmp
 version.h.tmp:
 	@test -f version.h || touch version.h;\
 	rm -f $@;\
-	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
-	if test $$? -ne 0; then\
+	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null || echo "exported")";\
+	if test "$$REVISION" = "exported"; then\
 	   REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
 	   if test "$$REVISION" = "rexported"; then\
 	    REVISION="";\

-- 
Debian repository for ClamAV