[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=70bd1f1

The following commit has been merged in the master branch:
commit 70bd1f1222992ad0263bfb694d6717e88cc2ea53
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jun 21 14:19:25 2015 +0000

    Fixed issues that prevented cross-compilation to work. Not sure what I broke with this or what this was needed for.
---
 config/config.mk.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.mk.in b/config/config.mk.in
index eaf3d57..8d92064 100644
--- a/config/config.mk.in
+++ b/config/config.mk.in
@@ -65,7 +65,7 @@ endif
 CXXCPP = @CXXCPP@
 
 # Preprocessor flags
-CPPFLAGS = -I../src -I../include/ -I../include/exiv2 @CPPFLAGS@ -I/usr/include -DEXV_LOCALEDIR=\"$(localedir)\"
+CPPFLAGS = -I../src -I../include/ -I../include/exiv2 @CPPFLAGS@ -DEXV_LOCALEDIR=\"$(localedir)\"
 ifeq ($(COMMERCIAL_VERSION),yes)
 	CPPFLAGS += -DEXV_COMMERCIAL_VERSION=1
 endif
@@ -168,7 +168,7 @@ COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
 COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 # LINK.cc does not need $(LIBS), libtool's dark magic takes care of that
 # when linking a binary with a libtool library.
-LINK.cc = $(CXX) $(LDFLAGS) -ldl
+LINK.cc = $(CXX) $(LDFLAGS)
 
 # **********************************************************************
 # Installation programs

-- 
exiv2 packaging