Add given user prefix to make target install_initscripts

Avoid files to be written into the live system if lvm was
configured with different --prefix.

Use initdir for install target path.

diff --git a/make.tmpl.in b/make.tmpl.in
index 7e2857a22eef227d635b2071d89646fe4fc16ea4..76537305eb79666431a2d80ab3b40c54431a4833 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -64,6 +64,8 @@ localedir = $(DESTDIR)@LOCALEDIR@
 staticdir = $(DESTDIR)@STATICDIR@
 udevdir = $(DESTDIR)@udevdir@
 pkgconfigdir = $(usrlibdir)/pkgconfig
+initdir = $(DESTDIR)@sysconfdir@/rc.d/init.d
+
 USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \
   $(AWK) -f $(top_srcdir)/scripts/relpath.awk)
 

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 2220b9c1a81598aafb95e7d679256f6ec94150dc..b91e4f8b7375887e453c951ce1400e6edb81d809 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -33,13 +33,13 @@ install: install_lvm2
 
 # FIXME Customise for other distributions
 install_initscripts:
-       $(INSTALL_DIR) $(DESTDIR)/etc/rc.d/init.d
-       $(INSTALL_SCRIPT) lvm2_monitoring_init_red_hat $(DESTDIR)/etc/rc.d/init.d/lvm2-monitor
+       $(INSTALL_DIR) $(initdir)
+       $(INSTALL_SCRIPT) lvm2_monitoring_init_red_hat $(initdir)/lvm2-monitor
 ifneq ("@CLVMD@", "none")
-       $(INSTALL_SCRIPT) clvmd_init_red_hat $(DESTDIR)/etc/rc.d/init.d/clvmd
+       $(INSTALL_SCRIPT) clvmd_init_red_hat $(initdir)/clvmd
 endif
 ifeq ("@BUILD_CMIRRORD@", "yes")
-       $(INSTALL_SCRIPT) cmirrord_init_red_hat $(DESTDIR)/etc/rc.d/init.d/cmirrord
+       $(INSTALL_SCRIPT) cmirrord_init_red_hat $(initdir)/cmirrord
 endif
 
 DISTCLEAN_TARGETS += clvmd_init_red_hat cmirrord_init_red_hat lvm2_monitoring_init_red_hat