[packages/device-mapper.git] / device-mapper-install.patch

diff -urN device-mapper.1.00.09.org/dmsetup/Makefile.in device-mapper.1.00.09/dmsetup/Makefile.in
--- device-mapper.1.00.09.org/dmsetup/Makefile.in	2004-04-01 01:58:07.096597280 +0200
+++ device-mapper.1.00.09/dmsetup/Makefile.in	2004-04-01 02:01:38.120516768 +0200
@@ -28,7 +28,7 @@
 	      -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 -urN device-mapper.1.00.09.org/lib/Makefile.in device-mapper.1.00.09/lib/Makefile.in
--- device-mapper.1.00.09.org/lib/Makefile.in	2004-04-01 01:58:07.179584664 +0200
+++ device-mapper.1.00.09/lib/Makefile.in	2004-04-01 02:02:30.597539048 +0200
@@ -30,29 +30,29 @@
 
 
 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
 
 install_static: install_@interface@_static
-	$(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a
+	$(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(DESTDIR)$(libdir)/libdevmapper.a
 	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \
-		$(includedir)/libdevmapper.h
+		$(DESTDIR)$(includedir)/libdevmapper.h
 
 
 .PHONY: install install_@interface@ install_static install_@interface@_static
 
 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)
 
 install_ioctl_static: ioctl/libdevmapper.a
 	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
-		$(libdir)/libdevmapper.a.$(LIB_VERSION)
+		$(DESTDIR)$(libdir)/libdevmapper.a.$(LIB_VERSION)
 
 distclean_lib: 
 	$(RM) libdm-common.h
diff -urN device-mapper.1.00.09.org/make.tmpl.in device-mapper.1.00.09/make.tmpl.in
--- device-mapper.1.00.09.org/make.tmpl.in	2004-04-01 01:58:07.094597584 +0200
+++ device-mapper.1.00.09/make.tmpl.in	2004-04-01 02:03:19.789060800 +0200
@@ -27,8 +27,8 @@
 LD_DEPS += @LD_DEPS@
 
 # Setup directory variables
-prefix = $(DESTDIR)@prefix@
-exec_prefix = $(DESTDIR)@exec_prefix@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
 bindir = @bindir@
 includedir = @includedir@
 libdir = @libdir@
diff -urN device-mapper.1.00.09.org/man/Makefile.in device-mapper.1.00.09/man/Makefile.in
--- device-mapper.1.00.09.org/man/Makefile.in	2004-04-01 01:58:07.195582232 +0200
+++ device-mapper.1.00.09/man/Makefile.in	2004-04-01 02:02:45.565263608 +0200
@@ -25,7 +25,7 @@
 	@echo "*** Installing $(ALL_MANUALS) in $(MAN8DIR) ***"
 	@for f in $(MANUALS); \
 	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
Commit	Line	Data
0792e225 AM	1	diff -urN device-mapper.1.00.09.org/dmsetup/Makefile.in device-mapper.1.00.09/dmsetup/Makefile.in
	2	--- device-mapper.1.00.09.org/dmsetup/Makefile.in 2004-04-01 01:58:07.096597280 +0200
	3	+++ device-mapper.1.00.09/dmsetup/Makefile.in 2004-04-01 02:01:38.120516768 +0200
	4	@@ -28,7 +28,7 @@
	5	-ldevmapper
483f2ce9 JR	6
	7	install: dmsetup
	8	- $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
0792e225	9	+ $(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< $(DESTDIR)$(sbindir)/$<
483f2ce9 JR	10
	11	.PHONY: install
	12
0792e225 AM	13	diff -urN device-mapper.1.00.09.org/lib/Makefile.in device-mapper.1.00.09/lib/Makefile.in
	14	--- device-mapper.1.00.09.org/lib/Makefile.in 2004-04-01 01:58:07.179584664 +0200
	15	+++ device-mapper.1.00.09/lib/Makefile.in 2004-04-01 02:02:30.597539048 +0200
	16	@@ -30,29 +30,29 @@
	17
483f2ce9 JR	18
	19	install: install_@interface@
	20	- $(LN_S) -f libdevmapper.so.$(LIB_VERSION) $(libdir)/libdevmapper.so
0792e225 AM	21	+ $(LN_S) -f libdevmapper.so.$(LIB_VERSION) $(DESTDIR)$(libdir)/libdevmapper.so
	22	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \
	23	- $(includedir)/libdevmapper.h
	24	+ $(DESTDIR)$(includedir)/libdevmapper.h
	25
	26	install_static: install_@interface@_static
	27	- $(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a
	28	+ $(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(DESTDIR)$(libdir)/libdevmapper.a
	29	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \
483f2ce9	30	- $(includedir)/libdevmapper.h
483f2ce9 JR	31	+ $(DESTDIR)$(includedir)/libdevmapper.h
483f2ce9 JR	32
0792e225 AM	33
0792e225 AM	34	.PHONY: install install_@interface@ install_static install_@interface@_static
483f2ce9 JR	35
483f2ce9 JR	36	install_fs: fs/libdevmapper.so
0792e225	37	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
483f2ce9	38	- $(libdir)/libdevmapper.so.$(LIB_VERSION)
483f2ce9 JR	39	+ $(DESTDIR)$(libdir)/libdevmapper.so.$(LIB_VERSION)
	40
	41	install_ioctl: ioctl/libdevmapper.so
0792e225	42	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
483f2ce9	43	- $(libdir)/libdevmapper.so.$(LIB_VERSION)
483f2ce9 JR	44	+ $(DESTDIR)$(libdir)/libdevmapper.so.$(LIB_VERSION)
483f2ce9 JR	45
0792e225 AM	46	install_ioctl_static: ioctl/libdevmapper.a
	47	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
	48	- $(libdir)/libdevmapper.a.$(LIB_VERSION)
	49	+ $(DESTDIR)$(libdir)/libdevmapper.a.$(LIB_VERSION)
	50
483f2ce9	51	distclean_lib:
0792e225 AM	52	$(RM) libdm-common.h
	53	diff -urN device-mapper.1.00.09.org/make.tmpl.in device-mapper.1.00.09/make.tmpl.in
	54	--- device-mapper.1.00.09.org/make.tmpl.in 2004-04-01 01:58:07.094597584 +0200
	55	+++ device-mapper.1.00.09/make.tmpl.in 2004-04-01 02:03:19.789060800 +0200
	56	@@ -27,8 +27,8 @@
	57	LD_DEPS += @LD_DEPS@
	58
	59	# Setup directory variables
	60	-prefix = $(DESTDIR)@prefix@
	61	-exec_prefix = $(DESTDIR)@exec_prefix@
	62	+prefix = @prefix@
	63	+exec_prefix = @exec_prefix@
	64	bindir = @bindir@
	65	includedir = @includedir@
	66	libdir = @libdir@
	67	diff -urN device-mapper.1.00.09.org/man/Makefile.in device-mapper.1.00.09/man/Makefile.in
	68	--- device-mapper.1.00.09.org/man/Makefile.in 2004-04-01 01:58:07.195582232 +0200
	69	+++ device-mapper.1.00.09/man/Makefile.in 2004-04-01 02:02:45.565263608 +0200
	70	@@ -25,7 +25,7 @@
	71	@echo "* Installing $(ALL_MANUALS) in $(MAN8DIR) *"
483f2ce9 JR	72	@for f in $(MANUALS); \
483f2ce9 JR	73	do \
0792e225	74	- $(RM) $(MAN8DIR)/$$f; \
483f2ce9	75	- @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
0792e225 AM	76	+ $(RM) $(DESTDIR)$(MAN8DIR)/$$f; \
0792e225 AM	77	+ @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(DESTDIR)$(MAN8DIR)/$$f; \
483f2ce9 JR	78	done
483f2ce9 JR	79