File dmraid_fixup_paths3.diff of Package dmraid

Overview Repositories Revisions Requests Users Attributes Meta

File dmraid_fixup_paths3.diff of Package dmraid

diff -pur dmraid/1.0.0.rc10.orig/include/Makefile.in dmraid/1.0.0.rc10/include/Makefile.in
--- dmraid/1.0.0.rc10.orig/include/Makefile.in	2006-02-17 17:19:25.000000000 +0100
+++ dmraid/1.0.0.rc10/include/Makefile.in	2006-08-08 16:36:21.000000000 +0200
@@ -17,14 +17,14 @@ include $(top_srcdir)/make.tmpl
 
 install_dmraid_headers: $(HEADERS)
 	@echo "Installing $(HEADERS) in $(includedir)/dmraid"
-	mkdir -p $(includedir)/dmraid
-	$(INSTALL) $(STRIP) $(HEADERS) $(includedir)/dmraid
+	mkdir -p $(DESTDIR)$(includedir)/dmraid
+	$(INSTALL) $(STRIP) $(HEADERS) $(DESTDIR)$(includedir)/dmraid
 
 install: install_dmraid_headers
 
 remove_dmraid_headers:
 	@echo "Removing $(HEADERS) from $(includedir)/dmraid"
-	rm -f $(includedir)/dmraid
+	rm -f $(DESTDIR)$(includedir)/dmraid
 
 remove:        remove_dmraid_headers
 
Nur in dmraid/1.0.0.rc10/lib/activate: activate.c~.
diff -pur dmraid/1.0.0.rc10.orig/lib/Makefile.in dmraid/1.0.0.rc10/lib/Makefile.in
--- dmraid/1.0.0.rc10.orig/lib/Makefile.in	2006-02-17 17:19:25.000000000 +0100
+++ dmraid/1.0.0.rc10/lib/Makefile.in	2006-08-09 10:56:06.000000000 +0200
@@ -62,16 +62,16 @@ include $(top_srcdir)/make.tmpl
 
 install_dmraid_libs: $(INSTALL_TARGETS)
 	@echo "Installing $(INSTALL_TARGETS) in $(libdir)"; \
-	mkdir -p $(libdir); \
+	mkdir -p $(DESTDIR)$(libdir); \
 	for f in $(INSTALL_TARGETS); \
 	do \
 		n=$$(basename $${f}) ; \
 		if [[ "$$n" =~ '.so$$' ]]; then \
 			$(INSTALL) -m 555 $(STRIP) \
-				$$f $(libdir)/$${n}.@DMRAID_LIB_VERSION@; \
-			$(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(libdir)/$${n}; \
+				$$f $(DESTDIR)$(libdir)/$${n}.@DMRAID_LIB_VERSION@; \
+			$(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(DESTDIR)$(libdir)/$${n}; \
 		else \
-			$(INSTALL) -m 555 $(STRIP) $$f $(libdir)/$${n}; \
+			$(INSTALL) -m 555 $(STRIP) $$f $(DESTDIR)$(libdir)/$${n}; \
 		fi \
 	done
 
@@ -82,8 +82,8 @@ remove_dmraid_libs:
 	for f in $(INSTALL_TARGETS); \
 	do \
 		n=$$(basename $${f}) ; \
-		rm -f $(libdir)/$${n}.@DMRAID_LIB_VERSION@; \
-		rm -f $(libdir)/$${n}; \
+		rm -f $(DESTDIR)$(libdir)/$${n}.@DMRAID_LIB_VERSION@; \
+		rm -f $(DESTDIR)$(libdir)/$${n}; \
 	done
 
 remove:	remove_dmraid_libs
Nur in dmraid/1.0.0.rc10/lib: Makefile.in~.
diff -pur dmraid/1.0.0.rc10.orig/make.tmpl.in dmraid/1.0.0.rc10/make.tmpl.in
--- dmraid/1.0.0.rc10.orig/make.tmpl.in	2006-02-17 17:18:27.000000000 +0100
+++ dmraid/1.0.0.rc10/make.tmpl.in	2006-08-08 16:35:32.000000000 +0200
@@ -21,8 +21,8 @@ LD_DEPS += @LD_DEPS@
 SOFLAG += @SOFLAG@
 
 # Setup directory variables
-prefix = $(DESTDIR)@prefix@
-exec_prefix = $(DESTDIR)@exec_prefix@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
 bindir = @bindir@
 ifeq ("@KLIBC@", "no")
   libdir = @libdir@
@@ -31,9 +31,9 @@ ifeq ("@KLIBC@", "no")
   infodir = @infodir@
   mandir = @mandir@
 else
-  libdir = $(DESTDIR)@KLIBC_LIB_DIR@
-  sbindir = $(DESTDIR)@KLIBC_SBIN_DIR@
-  includedir = $(DESTDIR)@KLIBC_INCLUDE_DIR@
+  libdir = @KLIBC_LIB_DIR@
+  sbindir = @KLIBC_SBIN_DIR@
+  includedir = @KLIBC_INCLUDE_DIR@
   infodir = @infodir@
   mandir = @mandir@
 endif
diff -pur dmraid/1.0.0.rc10.orig/man/Makefile.in dmraid/1.0.0.rc10/man/Makefile.in
--- dmraid/1.0.0.rc10.orig/man/Makefile.in	2006-02-17 17:19:25.000000000 +0100
+++ dmraid/1.0.0.rc10/man/Makefile.in	2006-08-08 16:35:32.000000000 +0200
@@ -20,8 +20,8 @@ install_dmraid_man:
 	mkdir -p $(MAN8DIR); \
 	for f in $(MAN8); \
 	do \
-	   $(RM) $(MAN8DIR)/$$f; \
-	   @INSTALL@ -D -m 444 $$f $(MAN8DIR)/$$f; \
+	   $(RM) $(DESTDIR)$(MAN8DIR)/$$f; \
+	   @INSTALL@ -D -m 444 $$f $(DESTDIR)$(MAN8DIR)/$$f; \
 	done
 
 install:	install_dmraid_man
@@ -30,7 +30,7 @@ remove_dmraid_man:
 	@echo "Removing $(MAN8) in $(MAN8DIR)"; \
 	for f in $(MAN8); \
 	do \
-	   $(RM) $(MAN8DIR)/$$f; \
+	   $(RM) $(DESTDIR)$(MAN8DIR)/$$f; \
 	done
 
 remove:	remove_dmraid_man
diff -pur dmraid/1.0.0.rc10.orig/tools/Makefile.in dmraid/1.0.0.rc10/tools/Makefile.in
--- dmraid/1.0.0.rc10.orig/tools/Makefile.in	2006-02-17 21:16:32.000000000 +0100
+++ dmraid/1.0.0.rc10/tools/Makefile.in	2006-08-09 11:08:10.000000000 +0200
@@ -60,8 +60,8 @@ dmraid:	$(OBJECTS) $(top_srcdir)/lib/lib
 
 install_dmraid_tools: $(TARGETS)
 	@echo "Installing $(TARGETS) in $(sbindir)"; \
-	mkdir -p $(sbindir); \
-	$(INSTALL) $(STRIP) $(TARGETS) $(sbindir)
+	mkdir -p $(DESTDIR)$(sbindir); \
+	$(INSTALL) $(STRIP) $(TARGETS) $(DESTDIR)$(sbindir)
 
 install: install_dmraid_tools
 
@@ -69,7 +69,7 @@ remove_dmraid_tools:
 	@echo "Removing $(TARGETS) from $(sbindir)"; \
 	for f in $(TARGETS); \
 	do \
-		rm -f $(sbindir)/$$f; \
+		rm -f $(DESTDIR)$(sbindir)/$$f; \
 	done
 
 remove:	remove_dmraid_tools
Nur in dmraid/1.0.0.rc10/tools: Makefile.in~.

Places

File dmraid_fixup_paths3.diff of Package dmraid

Places