[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=5869edd

The following commit has been merged in the master branch:
commit 5869edd6797912c3cbeb0d1b903231119134c7e5
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Jul 24 20:51:23 2013 +0000

    Update to 3091
---
 samples/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/samples/Makefile b/samples/Makefile
index 74cd231..71bdba1 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -1,6 +1,6 @@
 # ************************************************************* -*- Makefile -*-
 #
-# Copyright (C) 2004-2012 Andreas Huggel <ahuggel at gmx.net>
+# Copyright (C) 2004-2013 Andreas Huggel <ahuggel at gmx.net>
 #
 # This Makefile is part of the Exiv2 distribution.
 #
@@ -104,6 +104,7 @@ DEP = $(BINSRC:%.cpp=$(DEPDIR)/%.d)
 endif
 
 PREFIX = /usr/local/lib
+LINK.cc += -rpath $(PREFIX) -L$(PREFIX) 
 
 # ******************************************************************************
 # Rules
@@ -117,7 +118,7 @@ $(BINOBJ): %.o: %.cpp
 
 $(BINARY): %: %.o
 	mkdir -pv ../bin 2>&1 > /dev/null
-	$(LIBTOOL) --mode=link $(LINK.cc) -rpath $(PREFIX) -L$(PREFIX) -o ../bin/$@ $@.o
+	$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $@.o
 
 %.ii: %.cpp
 	set -e; \

-- 
exiv2 packaging