From 17ed09d594703cd9cb7cf85229bacb70153137a9 Mon Sep 17 00:00:00 2001
From: Benjamin Marzinski <bmarzins@fedoraproject.org>
Date: Tue, 20 May 2008 06:30:55 +0000
Subject: [PATCH] Fixed Makefile issues.

---
 device-mapper-multipath.spec | 5 ++++-
 linking_change.patch         | 3 +--
 makefiles_fix.patch          | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index 0337331..a9b5726 100644
--- a/device-mapper-multipath.spec
+++ b/device-mapper-multipath.spec
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -103,6 +103,9 @@ fi
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Mon May 19 2008 Benjamin Marzinksi <bmarzins@redhat.com> 0.4.8-4
+- Fixed Makefile issues.
+
 * Mon May 19 2008 Benjamin Marzinksi <bmarzins@redhat.com> 0.4.8-3
 - Fixed ownership build error.
 	
diff --git a/linking_change.patch b/linking_change.patch
index 0215e3a..9a8a142 100644
--- a/linking_change.patch
+++ b/linking_change.patch
@@ -2,7 +2,7 @@ Index: multipath-tools-080519/libmultipath/Makefile
 ===================================================================
 --- multipath-tools-080519.orig/libmultipath/Makefile
 +++ multipath-tools-080519/libmultipath/Makefile
-@@ -23,14 +23,16 @@ endif
+@@ -23,14 +23,15 @@ endif
  all: $(LIBS)
  
  $(LIBS): $(OBJS)
@@ -14,7 +14,6 @@ Index: multipath-tools-080519/libmultipath/Makefile
 +	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(prefix)/lib/$(LIBS)
  	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
 -	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)/$(LIBS)
-+	ldconfig
  
  uninstall:
 -	rm -f $(DESTDIR)$(libdir)/$(LIBS)
diff --git a/makefiles_fix.patch b/makefiles_fix.patch
index 0c6d4fe..23921c6 100644
--- a/makefiles_fix.patch
+++ b/makefiles_fix.patch
@@ -26,7 +26,7 @@ Index: multipath-tools-080519/libmultipath/checkers/Makefile
  
  install:
 -	$(INSTALL_PROGRAM) -o root -g root -m 755 $(LIBS) $(libdir)
-+	$(INSTALL_PROGRAM) -o root -g root -m 755 $(LIBS) $(DESTDIR)$(libdir)
++	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
  
  uninstall:
 -	rm -f $(libdir)/$(LIBS)