[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 07c85f3778c89c35de20b3f03b9a37c5cfd035a7
Author: Török Edvin <edwin at clamav.net>
Date:   Tue Jan 26 22:11:31 2010 +0200

    Really fix dist*.
    
    These makefiles are copied by configure from srcdir to objdir,
    so in that case yes they should be removed by distclean.
    However if we are building srcdir == objdir they shouldn't be.

diff --git a/libclamav/c++/Makefile.am b/libclamav/c++/Makefile.am
index 2392d48..48ea3a5 100644
--- a/libclamav/c++/Makefile.am
+++ b/libclamav/c++/Makefile.am
@@ -865,6 +865,11 @@ distclean-local:
 	rm -f llvm/include/llvm/System/DataTypes.h llvm/include/llvm/Config/Targets.def
 	rm -f llvm/tools/llvmc/plugins/Base/Base.td llvm/tools/llvm-config/llvm-config.in
 	rm -f llvm/include/llvm/Config/AsmParsers.def
+	if test $(abs_srcdir) != $(abs_builddir); then\
+	    rm -f llvm/lib/Makefile llvm/test/Makefile\
+	    llvm/test/Makefile.tests llvm/tools/Makefile llvm/utils/Makefile\
+	    llvm/Makefile.common llvm/unittests/Makefile;\
+	fi
 
 check-llvm: build-llvm-for-check
 	+$(GMAKE) -C llvm check
diff --git a/libclamav/c++/Makefile.in b/libclamav/c++/Makefile.in
index ea88479..759f91f 100644
--- a/libclamav/c++/Makefile.in
+++ b/libclamav/c++/Makefile.in
@@ -7704,6 +7704,11 @@ distclean-local:
 	rm -f llvm/include/llvm/System/DataTypes.h llvm/include/llvm/Config/Targets.def
 	rm -f llvm/tools/llvmc/plugins/Base/Base.td llvm/tools/llvm-config/llvm-config.in
 	rm -f llvm/include/llvm/Config/AsmParsers.def
+	if test $(abs_srcdir) != $(abs_builddir); then\
+	    rm -f llvm/lib/Makefile llvm/test/Makefile\
+	    llvm/test/Makefile.tests llvm/tools/Makefile llvm/utils/Makefile\
+	    llvm/Makefile.common llvm/unittests/Makefile;\
+	fi
 
 check-llvm: build-llvm-for-check
 	+$(GMAKE) -C llvm check

-- 
Debian repository for ClamAV