Introduce lvm2_install target.

Buildsystem support device-mapper only install,
but generic install tagret includes both dm+lvm2.

For distribution which uses separate install_device-mapper,
there is no way how to install lvm2 only
(so after installing lvm2 for packaging purposes
built system must remove installed device-mapper files).

Fix it by allowing lvm2_install target, similarily like
install_cluster for clvmd.

(install = install_device-mapper + install_lvm2)

diff --git a/WHATS_NEW b/WHATS_NEW
index 1c0be3025e52c5eedbaa4bf864bcc437e5f3a197..3a656cef5388c74d1e398322d6d00774f99e6afc 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.46 - 
 ================================
+  Add make install_lvm2 as complement to device-mapper install.
   Reject missing PVs from allocation in toollib.
   Fix PV datalignment for values starting prior to MDA area. (2.02.45)
   Add sparse devices: lvcreate -s --virtualoriginsize (hidden zero origin).

diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in
index 4154d055415d71099bab1a8e60b16922dd683841..51eaba6055c70756ed29e0127d952bc048e49360 100644 (file)
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
@@ -31,7 +31,9 @@ LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_srcdir)/make.tmpl
 
-install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
+install_lvm2: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
                $(libdir)/$<.$(LIB_VERSION)
        $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
+
+install: install_lvm2

diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in
index fd3851b1d602ffdf2171a244868a0b9b2385f802..863838f101170c50f4e08651ad8416facdc45deb 100644 (file)
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
@@ -31,7 +31,9 @@ LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_srcdir)/make.tmpl
 
-install: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
+install_lvm2: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
                $(libdir)/$<.$(LIB_VERSION)
        $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
+
+install: install_lvm2

diff --git a/doc/Makefile.in b/doc/Makefile.in
index b3277528cd9b50a166b46936812bd40c0719afd7..b135b94a9c10be1f020b33da92d334dc73c31fa3 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -20,10 +20,11 @@ CONFDEST=lvm.conf
 
 include $(top_srcdir)/make.tmpl
 
-install:
+install_lvm2:
        @if [ ! -e $(confdir)/$(CONFDEST) ]; then \
                echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
                @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
                        $(confdir)/$(CONFDEST); \
        fi
 
+install: install_lvm2

diff --git a/include/Makefile.in b/include/Makefile.in
index 2d86488a454968509a6abc29b9b9ea5ab6457b84..301290ef45d91a1f920a3418dbe3591490599b6d 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -45,5 +45,7 @@ install_cluster:
 
 install_device-mapper:
 
+install_lvm2:
+
 cflow:
 

diff --git a/make.tmpl.in b/make.tmpl.in
index d5c2fa9ccdf74a84b6d79a364ed4fc318bfe0030..fa3b884f69ec2285efc1818a8f156feee3f75e9c 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -126,7 +126,7 @@ OBJECTS = $(SOURCES:%.c=%.o)
 POTFILES = $(SOURCES:%.c=%.pot)
 
 .PHONY: all install install_cluster pofile distclean clean cflow device-mapper 
-.PHONY: install_device-mapper
+.PHONY: install_device-mapper install_lvm2
 .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
 .PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow)
 .PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper)
@@ -135,6 +135,7 @@ SUBDIRS.device-mapper := $(SUBDIRS:=.device-mapper)
 SUBDIRS.install := $(SUBDIRS:=.install)
 SUBDIRS.install_cluster := $(SUBDIRS:=.install_cluster)
 SUBDIRS.install_device-mapper := $(SUBDIRS:=.install_device-mapper)
+SUBDIRS.install_lvm2 := $(SUBDIRS:=.install_lvm2)
 SUBDIRS.pofile := $(SUBDIRS:=.pofile)
 SUBDIRS.cflow := $(SUBDIRS:=.cflow)
 SUBDIRS.clean := $(SUBDIRS:=.clean)
@@ -147,6 +148,7 @@ all: $(SUBDIRS) $(TARGETS)
 install: all $(SUBDIRS.install)
 install_cluster: all $(SUBDIRS.install_cluster)
 install_device-mapper: $(SUBDIRS.install_device-mapper)
+install_lvm2: $(SUBDIRS.install_lvm2)
 
 $(SUBDIRS): $(SUBDIRS.device-mapper)
        $(MAKE) -C $@
@@ -163,6 +165,9 @@ $(SUBDIRS.install_cluster): $(SUBDIRS)
 $(SUBDIRS.install_device-mapper): device-mapper
        $(MAKE) -C $(@:.install_device-mapper=) install_device-mapper
 
+$(SUBDIRS.install_lvm2): $(SUBDIRS)
+       $(MAKE) -C $(@:.install_lvm2=) install_lvm2
+
 $(SUBDIRS.clean):
        -$(MAKE) -C $(@:.clean=) clean
 

diff --git a/man/Makefile.in b/man/Makefile.in
index f1a34d742b874ed985739870b6784650210b9b8a..1406dd93f1300cc5d490d67c2b680a630ee315f2 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -57,7 +57,7 @@ $(MAN5) $(MAN8) $(MAN8CLUSTER):       Makefile
 %: %.in
        $(SED) -e "s/#VERSION#/$(LVM_VERSION)/" $< > $@
 
-install: install_device-mapper
+install_lvm2:
        @echo "Installing $(MAN8) in $(MAN8DIR)"
        @for f in $(MAN8); \
        do \
@@ -87,3 +87,5 @@ install_device-mapper:
           $(RM) $(MAN8DIR)/$$f; \
           @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
        done
+
+install: install_lvm2 install_device-mapper

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index afd3916137b2b744ee9c9b8ec2ced491149e858a..d8ee816475849a09ad7ea405c33152c86a7beca7 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -17,6 +17,8 @@ VPATH = @srcdir@
 
 include $(top_srcdir)/make.tmpl
 
+install_lvm2: install
+
 install:
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm_dump.sh \
                $(sbindir)/lvmdump

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 874d3914c745a021032a54fc574c3c2bb2dd7926..89c4609195b5831eb23c4b85ded15e73c24027ba 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -195,4 +195,6 @@ install_dmsetup_static: dmsetup.static
 
 install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
 
-install: $(INSTALL_LVM_TARGETS) install_device-mapper
+install_lvm2: $(INSTALL_LVM_TARGETS)
+
+install: install_lvm2 install_device-mapper