[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=5e6868f

The following commit has been merged in the master branch:
commit 5e6868fa69608127beb65fb95895d4c41f140945
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Sep 23 12:03:19 2013 +0000

    Tweaked Makefile to prevent re-linking the exiv2 binary unnecessarily.
---
 src/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index b6e594a..4b8481f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -166,7 +166,7 @@ LOBJ = $(CCLOBJ) $(CLOBJ)
 
 EXIV2OBJ = $(EXIV2MAIN:.cpp=.o) $(EXIV2SRC:.cpp=.o)
 EXIV2COBJ = $(EXIVCSRC:.c=.o)
-EXIV2BIN = $(EXIV2MAIN:.cpp=)
+EXIV2BIN = ../bin/$(EXIV2MAIN:.cpp=)
 EXIV2EXE = $(EXIV2MAIN:.cpp=$(EXEEXT))
 
 ifdef DEP_TRACKING
@@ -231,7 +231,7 @@ lib: $(OBJ)
 
 $(EXIV2BIN): lib $(EXIV2OBJ) $(EXIV2COBJ)
 	-mkdir ../bin >/dev/null 2>&1
-	@$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir)
+	@$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir)
 
 install-header:
 	$(INSTALL_DIRS) $(DESTDIR)$(incdir)

-- 
exiv2 packaging