[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=6620415

The following commit has been merged in the master branch:
commit 6620415b69340cc5d6edafdb4c4ff097dcfb36f4
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Dec 7 03:40:05 2014 +0000

    Really fix issue #1006: Add checks for the test directory to config/Makefile.in.
---
 Makefile           | 28 ++++++++++++++++++++++++----
 config/Makefile.in | 28 ++++++++++++++++++++++++----
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 1d96c11..93753d6 100644
--- a/Makefile
+++ b/Makefile
@@ -71,16 +71,36 @@ samples: config/config.mk
 	cd samples && $(MAKE) $(MAKECMDGOALS)
 
 tests:
-	cd test && $(MAKE) test
+	@if [ ! -d test ]; then \
+		echo "*** directory test not available ***" ; \
+		echo "*** see http://dev.exiv2.org/projects/exiv2/wiki/How_do_I_build_Exiv2_on_the_XYZ_platform for more information ***" ; \
+	else \
+		cd test && $(MAKE) test ; \
+	fi
 
 teste:
-	cd test && $(MAKE) teste
+	@if [ ! -d test ]; then \
+		echo "*** directory test not available ***" ; \
+		echo "*** see http://dev.exiv2.org/projects/exiv2/wiki/How_do_I_build_Exiv2_on_the_XYZ_platform for more information ***" ; \
+	else \
+		cd test && $(MAKE) teste ; \
+	fi
 
 testv:
-	cd test && $(MAKE) testv
+	@if [ ! -d test ]; then \
+		echo "*** directory test not available ***" ; \
+		echo "*** see http://dev.exiv2.org/projects/exiv2/wiki/How_do_I_build_Exiv2_on_the_XYZ_platform for more information ***" ; \
+	else \
+		cd test && $(MAKE) testv ; \
+	fi
 
 testvw:
-	cd test && $(MAKE) testvw	
+	@if [ ! -d test ]; then \
+		echo "*** directory test not available ***" ; \
+		echo "*** see http://dev.exiv2.org/projects/exiv2/wiki/How_do_I_build_Exiv2_on_the_XYZ_platform for more information ***" ; \
+	else \
+		cd test && $(MAKE) testvw ; \
+	fi
 
 MAJOR=$(shell grep "define.*EXIV2_.*_VERSION .*\d*" src/version.hpp | grep MAJOR | sed -e 's/EXIV2//g' | tr -dC [:digit:])
 MINOR=$(shell grep "define.*EXIV2_.*_VERSION .*\d*" src/version.hpp | grep MINOR | sed -e 's/EXIV2//g' | tr -dC [:digit:])
diff --git a/config/Makefile.in b/config/Makefile.in
index ecae1d0..ec90946 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -71,16 +71,36 @@ samples: config/config.mk
 	cd samples && $(MAKE) $(MAKECMDGOALS)
 
 tests:
-	cd test && $(MAKE) test
+	@if [ ! -d test ]; then \
+		echo "*** directory test not available ***" ; \
+		echo "*** see http://dev.exiv2.org/projects/exiv2/wiki/How_do_I_build_Exiv2_on_the_XYZ_platform for more information ***" ; \
+	else \
+		cd test && $(MAKE) test ; \
+	fi
 
 teste:
-	cd test && $(MAKE) teste
+	@if [ ! -d test ]; then \
+		echo "*** directory test not available ***" ; \
+		echo "*** see http://dev.exiv2.org/projects/exiv2/wiki/How_do_I_build_Exiv2_on_the_XYZ_platform for more information ***" ; \
+	else \
+		cd test && $(MAKE) teste ; \
+	fi
 
 testv:
-	cd test && $(MAKE) testv
+	@if [ ! -d test ]; then \
+		echo "*** directory test not available ***" ; \
+		echo "*** see http://dev.exiv2.org/projects/exiv2/wiki/How_do_I_build_Exiv2_on_the_XYZ_platform for more information ***" ; \
+	else \
+		cd test && $(MAKE) testv ; \
+	fi
 
 testvw:
-	cd test && $(MAKE) testvw	
+	@if [ ! -d test ]; then \
+		echo "*** directory test not available ***" ; \
+		echo "*** see http://dev.exiv2.org/projects/exiv2/wiki/How_do_I_build_Exiv2_on_the_XYZ_platform for more information ***" ; \
+	else \
+		cd test && $(MAKE) testvw ; \
+	fi
 
 MAJOR=$(shell grep "define.*EXIV2_.*_VERSION .*\d*" src/version.hpp | grep MAJOR | sed -e 's/EXIV2//g' | tr -dC [:digit:])
 MINOR=$(shell grep "define.*EXIV2_.*_VERSION .*\d*" src/version.hpp | grep MINOR | sed -e 's/EXIV2//g' | tr -dC [:digit:])

-- 
exiv2 packaging