[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=1b45bf6

The following commit has been merged in the master branch:
commit 1b45bf6e39480a7ba3d66f2bc6f921716f6b7400
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Oct 10 14:45:33 2005 +0000

    Honour DESTDIR variable in Makefile
---
 src/Makefile | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index e6c04af..4d9290f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -200,36 +200,36 @@ $(MCBIN): lib $(MCOBJ)
 	@$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(MCOBJ)
 
 install-header:
-	$(INSTALL_DIRS) $(incdir)
+	$(INSTALL_DIRS) $(DESTDIR)$(incdir)
 	@list='$(HDR)'; for p in $$list; do \
 	    if test -f $$p; then \
-	        echo "$(INSTALL_DATA) $$p $(incdir)/$$p"; \
-	        $(INSTALL_DATA) $$p $(incdir)/$$p; \
+	        echo "$(INSTALL_DATA) $$p $(DESTDIR)$(incdir)/$$p"; \
+	        $(INSTALL_DATA) $$p $(DESTDIR)$(incdir)/$$p; \
 	    else :; fi; \
 	done
 
 install-lib: lib install-header
-	$(INSTALL_DIRS) $(libdir)
-	@$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBRARY) $(libdir)/$(LIBRARY)
+	$(INSTALL_DIRS) $(DESTDIR)$(libdir)
+	@$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
 
 install: $(EXIV2BIN) install-lib
-	$(INSTALL_DIRS) $(bindir)
-	@$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(EXIV2EXE) $(bindir)/$(EXIV2EXE)
+	$(INSTALL_DIRS) $(DESTDIR)$(bindir)
+	@$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(EXIV2EXE) $(DESTDIR)$(bindir)/$(EXIV2EXE)
 
 uninstall-header:
 	@list='$(HDR)'; for p in $$list; do \
-	    echo "$(RM) $(incdir)/$$p"; \
-	    $(RM) $(incdir)/$$p; \
+	    echo "$(RM) $(DESTDIR)$(incdir)/$$p"; \
+	    $(RM) $(DESTDIR)$(incdir)/$$p; \
 	done
-	-rmdir $(incdir)
+	-rmdir $(DESTDIR)$(incdir)
 
 uninstall-lib: uninstall-header
-	@$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(LIBRARY)
-	-rmdir $(libdir)
+	@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY)
+	-rmdir $(DESTDIR)$(libdir)
 
 uninstall: uninstall-lib
-	@$(LIBTOOL) --mode=uninstall $(RM) $(bindir)/$(EXIV2EXE)
-	-rmdir $(bindir)
+	@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(bindir)/$(EXIV2EXE)
+	-rmdir $(DESTDIR)$(bindir)
 
 ctags:
 	ebrowse $(CCHDR) $(CCSRC)

-- 
exiv2 packaging