From afcae0664e94a014fa9614ebcd3c89f19f0d1866 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 5 Nov 2010 16:13:18 +0000 Subject: [PATCH] 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. --- make.tmpl.in | 2 ++ scripts/Makefile.in | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/make.tmpl.in b/make.tmpl.in index 7e2857a22..76537305e 100644 --- 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 2220b9c1a..b91e4f8b7 100644 --- 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