multipath-tools: DESTDIR makefiles cleanup

This patch makes the $(DESTDIR) makefile option for multipath-tools more
useful. First, it makes sure that everything that's installed uses it.
Second, it removes the forced root installs, so that you can can install
to any $(DESTDIR) that you have permissions for, even if you aren't
root.

Signed-off-by: Benjamin Marzinski <bmarzins redhat com>

diff --git a/libmultipath/Makefile b/libmultipath/Makefile
index 05bcc37..21fcd74 100644 (file)
--- a/libmultipath/Makefile
+++ b/libmultipath/Makefile
@@ -26,11 +26,11 @@ $(LIBS): $(OBJS)
        $(CC) $(SHARED_FLAGS) $(CFLAGS) -o $@ $(OBJS)
 
 install:
-       $(INSTALL_PROGRAM) -o root -g root -m 755 -d $(libdir)
-       $(INSTALL_PROGRAM) -o root -g root -m 755 $(LIBS) $(libdir)/$(LIBS)
+       $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
+       $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)/$(LIBS)
 
 uninstall:
-       rm -f $(libdir)/$(LIBS)
+       rm -f $(DESTDIR)$(libdir)/$(LIBS)
 
 clean:
        rm -f core *.a *.o *.gz *.so

diff --git a/libmultipath/checkers/Makefile b/libmultipath/checkers/Makefile
index 9b517f2..a20dfac 100644 (file)
--- a/libmultipath/checkers/Makefile
+++ b/libmultipath/checkers/Makefile
@@ -21,10 +21,10 @@ libcheck%.so: libsg.o %.o
        $(CC) $(SHARED_FLAGS) -o $@ $^
 
 install:
-       $(INSTALL_PROGRAM) -o root -g root -m 755 $(LIBS) $(libdir)
+       $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
 
 uninstall:
-       rm -f $(libdir)/$(LIBS)
+       rm -f $(DESTDIR)$(libdir)/$(LIBS)
 
 clean:
        rm -f core *.a *.o *.gz *.so

diff --git a/libmultipath/prioritizers/Makefile b/libmultipath/prioritizers/Makefile
index c05d457..1f70ef1 100644 (file)
--- a/libmultipath/prioritizers/Makefile
+++ b/libmultipath/prioritizers/Makefile
@@ -25,10 +25,10 @@ libprio%.so: %.o
        $(CC) $(SHARED_FLAGS) -o $@ $^
 
 install: $(LIBS)
-       install -m 755 libprio*.so $(libdir)
+       $(INSTALL_PROGRAM) -m 755 libprio*.so $(DESTDIR)$(libdir)
 
 uninstall:
-       rm -f $(libdir)/libprio*.so
+       rm -f $(DESTDIR)$(libdir)/libprio*.so
 
 clean:
        rm -f core *.a *.o *.gz *.so