public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2 ./make.tmpl.in scripts/Makefile.in
@ 2010-11-05 16:13 zkabelac
0 siblings, 0 replies; only message in thread
From: zkabelac @ 2010-11-05 16:13 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2010-11-05 16:13:19
Modified files:
. : make.tmpl.in
scripts : Makefile.in
Log message:
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.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.112&r2=1.113
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/scripts/Makefile.in.diff?cvsroot=lvm2&r1=1.18&r2=1.19
--- LVM2/make.tmpl.in 2010/10/07 16:33:35 1.112
+++ LVM2/make.tmpl.in 2010/11/05 16:13:18 1.113
@@ -64,6 +64,8 @@
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)
--- LVM2/scripts/Makefile.in 2010/05/20 14:45:17 1.18
+++ LVM2/scripts/Makefile.in 2010/11/05 16:13:19 1.19
@@ -33,13 +33,13 @@
# 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-11-05 16:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-05 16:13 LVM2 ./make.tmpl.in scripts/Makefile.in zkabelac
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).