public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/udev Makefile.in
@ 2010-03-31  7:40 zkabelac
  0 siblings, 0 replies; 3+ messages in thread
From: zkabelac @ 2010-03-31  7:40 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-03-31 07:40:21

Modified files:
	udev           : Makefile.in 

Log message:
	Install generated 10-dm.rules from builddir.
	
	Patch just check whether file is generated in builddir otherwise srcdir file
	is used.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/udev/Makefile.in.diff?cvsroot=lvm2&r1=1.5&r2=1.6

--- LVM2/udev/Makefile.in	2010/03/04 09:51:42	1.5
+++ LVM2/udev/Makefile.in	2010/03/31 07:40:20	1.6
@@ -40,7 +40,8 @@
 	@for f in $(DM_RULES); \
 	do \
 	   $(RM) $(udevdir)/$$f; \
-	   $(INSTALL) -c -D $(OWNER) $(GROUP) -m 644 $(srcdir)/$$f $(udevdir)/$$f; \
+	   if test -f $$f; then file=$$f; else file=$(srcdir)/$$f; fi; \
+	   $(INSTALL) -c -D $(OWNER) $(GROUP) -m 644 $$file $(udevdir)/$$f; \
 	done
 
 install: install_lvm2 install_device-mapper


^ permalink raw reply	[flat|nested] 3+ messages in thread
* LVM2/udev Makefile.in
@ 2010-04-09 21:44 zkabelac
  0 siblings, 0 replies; 3+ messages in thread
From: zkabelac @ 2010-04-09 21:44 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-04-09 21:44:28

Modified files:
	udev           : Makefile.in 

Log message:
	Update install rules for udev.
	
	Fix unwanted modification of $(top_builddir)/make.tmpl.
	
	Using dependency rules to install rules for udev.
	There is minor problem, with concurent usage of builddir
	and srcdir could lead to missuse of 10-dm.rules which
	could be found in VPATH from different builddir.
	However current solution uses intermediate target so
	the generated 10-dm.rules exists only for short period of time
	during make install execution.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/udev/Makefile.in.diff?cvsroot=lvm2&r1=1.7&r2=1.8

--- LVM2/udev/Makefile.in	2010/04/09 21:34:32	1.7
+++ LVM2/udev/Makefile.in	2010/04/09 21:44:28	1.8
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2009-2010 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -25,24 +25,13 @@
 
 vpath %.rules $(srcdir)
 
-%: %.in
+%.rules: %.rules.in
 	$(SED) -e "s/(DM_DIR)/$(DM_DIR)/" $< >$@
 
-install_lvm2: $(LVM_RULES)
-	@echo "Installing $(LVM_RULES) in $(udevdir)"
-	@for f in $(LVM_RULES); \
-	do \
-	   $(RM) $(udevdir)/$$f; \
-	   $(INSTALL) -c -D $(OWNER) $(GROUP) -m 644 $(srcdir)/$$f $(udevdir)/$$f; \
-	done
-
-install_device-mapper: $(DM_RULES)
-	@echo "Installing $(DM_RULES) in $(udevdir)"
-	@for f in $(DM_RULES); \
-	do \
-	   $(RM) $(udevdir)/$$f; \
-	   if test -f $$f; then file=$$f; else file=$(srcdir)/$$f; fi; \
-	   $(INSTALL) -c -D $(OWNER) $(GROUP) -m 644 $$file $(udevdir)/$$f; \
-	done
+%_install: %.rules
+	$(INSTALL_DATA) -D $< $(udevdir)/$(<F)
+
+install_device-mapper: $(DM_RULES:.rules=_install)
+install_lvm2: $(LVM_RULES:.rules=_install)
 
 install: install_lvm2 install_device-mapper


^ permalink raw reply	[flat|nested] 3+ messages in thread
* LVM2/udev Makefile.in
@ 2009-07-31 18:41 agk
  0 siblings, 0 replies; 3+ messages in thread
From: agk @ 2009-07-31 18:41 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2009-07-31 18:41:19

Added files:
	udev           : Makefile.in 

Log message:
	dummy makefile for now to keep builds happy

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/udev/Makefile.in.diff?cvsroot=lvm2&r1=NONE&r2=1.1

/cvs/lvm2/LVM2/udev/Makefile.in,v  -->  standard output
revision 1.1
--- LVM2/udev/Makefile.in
+++ -	2009-07-31 18:41:19.275223000 +0000
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2009 Red Hat, Inc. All rights reserved.
+#
+# This file is part of LVM2.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+srcdir = .
+top_srcdir = ..
+


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-04-09 21:44 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-31  7:40 LVM2/udev Makefile.in zkabelac
  -- strict thread matches above, loose matches on Subject: below --
2010-04-09 21:44 zkabelac
2009-07-31 18:41 agk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).