[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [lvm-devel] [PATCH 2/3] Add ${prefix}



Dne 2.11.2010 15:10, Zdenek Kabelac napsal(a):
> Avoid files to be written into the live system if lvm was
> configured with diferent --prefix.
> Also put path into one variable initd_dir.
> 
> Signed-off-by: Zdenek Kabelac <zkabelac redhat com>
> ---

Updated version with  initdir defined in make.tmpl.in

Zdenek
Avoid files to be written into the live system if lvm was
configured with diferent --prefix.
Also put path into one variable initd_dir.
---
 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 faccd60..bf77e13 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 2220b9c..b91e4f8 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
-- 
1.7.3.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]