PATCH: use of DESTDIR makefiles (target install)

hiho,

i've just switched from lvm1 to lvm2 and have built my own 
devicemapper/lvm2 rpms. building these packages i noticed that DESTDIR 
isn't used in the makefiles. the patches are against 
devicemapper-0.96.08 and lvm2-1.95.15.

-ap

--
Andreas Piesk <a.piesk@xxxxxxx>
PGP-Fingerprint: 23CB A7E2 2E53 373C  DBCD 8EFC 7777 61C1
diff -Pur LVM2.1.95.15/lib/format1/Makefile.in 
LVM2.1.95.15.mod/lib/format1/Makefile.in
--- LVM2.1.95.15/lib/format1/Makefile.in        2002-11-18 15:01:15.000000000 
+0100
+++ LVM2.1.95.15.mod/lib/format1/Makefile.in    2003-04-20 22:39:58.000000000 
+0200
@@ -24,8 +24,8 @@
 
 install: libformat1.so
        $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/liblvm2format1.so.$(LIB_VERSION)
-       $(LN_S) -f liblvm2format1.so.$(LIB_VERSION) $(libdir)/liblvm2format1.so
+               $(DESTDIR)$(libdir)/liblvm2format1.so.$(LIB_VERSION)
+       $(LN_S) -f liblvm2format1.so.$(LIB_VERSION) 
$(DESTDIR)$(libdir)/liblvm2format1.so
 
 .PHONY: install
 
diff -Pur LVM2.1.95.15/man/Makefile.in LVM2.1.95.15.mod/man/Makefile.in
--- LVM2.1.95.15/man/Makefile.in        2002-12-12 21:55:48.000000000 +0100
+++ LVM2.1.95.15.mod/man/Makefile.in    2003-04-20 22:40:52.000000000 +0200
@@ -36,13 +36,13 @@
        @echo "Installing $(MAN8) in $(MAN8DIR)"
        @for f in $(MAN8); \
        do \
-          $(RM) $(MAN8DIR)/$$f; \
-          @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
+          $(RM) $(DESTDIR)$(MAN8DIR)/$$f; \
+          @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f 
$(DESTDIR)$(MAN8DIR)/$$f; \
        done
 
        @echo "Installing $(MAN5) in $(MAN8DIR)"
        @for f in $(MAN5); \
        do \
-          $(RM) $(MAN5DIR)/$$f; \
-          @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \
+          $(RM) $(DESTDIR)$(MAN5DIR)/$$f; \
+          @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f 
$(DESTDIR)$(MAN5DIR)/$$f; \
        done
diff -Pur LVM2.1.95.15/tools/Makefile.in LVM2.1.95.15.mod/tools/Makefile.in
--- LVM2.1.95.15/tools/Makefile.in      2003-01-08 23:44:07.000000000 +0100
+++ LVM2.1.95.15.mod/tools/Makefile.in  2003-04-20 22:43:20.000000000 +0200
@@ -79,11 +79,11 @@
 
 install: $(TARGETS)
        $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) lvm \
-               $(sbindir)/lvm
+               $(DESTDIR)$(sbindir)/lvm
        @echo Creating symbolic links for individual commands in $(sbindir)
        @( \
                for v in `cat .commands`; do \
-                       cd $(sbindir); \
+                       cd $(DESTDIR)$(sbindir); \
                        $(LN_S) -f lvm $$v; \
                done; \
        )
diff -Pur device-mapper.0.96.08/dmsetup/Makefile.in 
device-mapper.0.96.08.mod/dmsetup/Makefile.in
--- device-mapper.0.96.08/dmsetup/Makefile.in   2002-01-02 14:40:48.000000000 
+0100
+++ device-mapper.0.96.08.mod/dmsetup/Makefile.in       2003-04-21 
00:51:27.000000000 +0200
@@ -17,7 +17,7 @@
        $(CC) -o dmsetup dmsetup.o $(LD_FLAGS) -ldevmapper
 
 install: dmsetup
-       $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+       $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< 
$(DESTDIR)$(sbindir)/$<
 
 .PHONY: install 
 
diff -Pur device-mapper.0.96.08/lib/Makefile.in 
device-mapper.0.96.08.mod/lib/Makefile.in
--- device-mapper.0.96.08/lib/Makefile.in       2003-01-21 22:22:55.000000000 
+0100
+++ device-mapper.0.96.08.mod/lib/Makefile.in   2003-04-21 00:53:20.000000000 
+0200
@@ -19,19 +19,19 @@
 
 
 install: install_@interface@
-       $(LN_S) -f libdevmapper.so.$(LIB_VERSION) $(libdir)/libdevmapper.so
+       $(LN_S) -f libdevmapper.so.$(LIB_VERSION) 
$(DESTDIR)$(libdir)/libdevmapper.so
        $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \
-               $(includedir)/libdevmapper.h
+               $(DESTDIR)$(includedir)/libdevmapper.h
 
 .PHONY: install install_@interface@
 
 install_fs: fs/libdevmapper.so
        $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/libdevmapper.so.$(LIB_VERSION)
+               $(DESTDIR)$(libdir)/libdevmapper.so.$(LIB_VERSION)
 
 install_ioctl: ioctl/libdevmapper.so
        $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
-               $(libdir)/libdevmapper.so.$(LIB_VERSION)
+               $(DESTDIR)$(libdir)/libdevmapper.so.$(LIB_VERSION)
 
 distclean_lib: 
        $(RM) libdm-common.h
diff -Pur device-mapper.0.96.08/man/Makefile.in 
device-mapper.0.96.08.mod/man/Makefile.in
--- device-mapper.0.96.08/man/Makefile.in       2002-01-02 14:40:49.000000000 
+0100
+++ device-mapper.0.96.08.mod/man/Makefile.in   2003-04-21 00:53:40.000000000 
+0200
@@ -30,6 +30,6 @@
        @for f in $(MANUALS); \
        do \
           $(RM) $(MAN8DIR)/$$f; \
-          @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
+          @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f 
$(DESTDIR)$(MAN8DIR)/$$f; \
        done