Install plugins to subdirs

Target install_dm_plugin installs files to libdir/device-mapper.
Target install_lvm2_plugin installs files to libdir/lvm2.

Both targets creates relative links to libdir to keep the code
compatible with current dlopen handling.

Once we will be able to read plugins from subdir, links
could be removed.

diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in
index 146361fc592e0facabbf106066d3da1404fa980e..5966f245a83717dbcddf446b6e72740120652a60 100644 (file)
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
@@ -32,6 +32,6 @@ include $(top_builddir)/make.tmpl
 
 LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS)
 
-install_lvm2: install_lib_shared_plugin
+install_lvm2: install_dm_plugin
 
 install: install_lvm2

diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in
index f36f916c370a3ab88d4a0155ba29904dbeafe85f..32a74af2bfbd1cea474377616417b0c073297aa7 100644 (file)
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
@@ -28,6 +28,6 @@ include $(top_builddir)/make.tmpl
 
 LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS)
 
-install_lvm2: install_lib_shared_plugin
+install_lvm2: install_dm_plugin
 
 install: install_lvm2

diff --git a/lib/format1/Makefile.in b/lib/format1/Makefile.in
index f0f04d2d49a3a47de7ce4ab27a74d119b585ecd2..e102fe8dc94bee3f197c58ad3a162f4a465a2e3b 100644 (file)
--- a/lib/format1/Makefile.in
+++ b/lib/format1/Makefile.in
@@ -30,4 +30,4 @@ LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-install: install_lib_shared_plugin
+install: install_lvm2_plugin

diff --git a/lib/format_pool/Makefile.in b/lib/format_pool/Makefile.in
index 0671ee85ea431638505065690381f0291f4c2016..be5195c342cc4bf764c9ccaaa9b439db16aad6df 100644 (file)
--- a/lib/format_pool/Makefile.in
+++ b/lib/format_pool/Makefile.in
@@ -27,4 +27,4 @@ LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-install: install_lib_shared_plugin
+install: install_lvm2_plugin

diff --git a/lib/locking/Makefile.in b/lib/locking/Makefile.in
index fee03820fd5a9ae3e4ddba940e8c88931816410c..1aae8782321160d8236f71f7a14f52d8186adb6a 100644 (file)
--- a/lib/locking/Makefile.in
+++ b/lib/locking/Makefile.in
@@ -23,4 +23,4 @@ LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-install install_cluster: install_lib_shared_plugin
+install install_cluster: install_lvm2_plugin

diff --git a/lib/mirror/Makefile.in b/lib/mirror/Makefile.in
index 2769d44d1a689cea209ee2dbf57d81513f019b3c..5168eda02c00c235b2aa249d5281527cec5fc728 100644 (file)
--- a/lib/mirror/Makefile.in
+++ b/lib/mirror/Makefile.in
@@ -23,4 +23,4 @@ LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-install: install_lib_shared_plugin
+install: install_lvm2_plugin

diff --git a/lib/snapshot/Makefile.in b/lib/snapshot/Makefile.in
index 7f8a54400d864b3e033d1835758452d64662aae1..72399f3ba74b1e6fd7d81d13b8e4135747e4294d 100644 (file)
--- a/lib/snapshot/Makefile.in
+++ b/lib/snapshot/Makefile.in
@@ -23,4 +23,4 @@ LIB_VERSION = $(LIB_VERSION_LVM)
 
 include $(top_builddir)/make.tmpl
 
-install: install_lib_shared_plugin
+install: install_lvm2_plugin

diff --git a/make.tmpl.in b/make.tmpl.in
index a2fe0035e2fe772ee4b74ebb3cf0ab16005d2914..2375e183a4dd236aacb01858e8c3cb8a122165c4 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -163,7 +163,7 @@ POTFILES = $(SOURCES:%.c=%.pot)
 
 .PHONY: all pofile distclean clean cleandir cflow device-mapper
 .PHONY: install install_cluster install_device-mapper install_lvm2
-.PHONY: install_lib_shared install_lib_shared_plugin
+.PHONY: install_lib_shared install_dm_plugin install_lvm2_plugin
 .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
 .PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow)
 .PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper)
@@ -306,9 +306,18 @@ install_lib_shared: $(LIB_SHARED)
        $(INSTALL) -d $(usrlibdir)
        $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
 
-# FIXME: plugins are currently installed with .so suffix only
-install_lib_shared_plugin: $(LIB_SHARED)
-       $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F)
+# FIXME: plugins are installed to subdirs 
+#        and for compatibility links in libdir are created
+#        when the code is fixed links could be removed.
+install_dm_plugin: $(LIB_SHARED)
+       $(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F)
+       $(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F)
+       $(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION)
+
+install_lvm2_plugin: $(LIB_SHARED)
+       $(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F)
+       $(LN_S) -f lvm2/$(<F) $(libdir)/$(<F)
+       $(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION)
 endif
 
 %.so: %.a