Add make install_initscripts

diff --git a/Makefile.in b/Makefile.in
index 4601ab4fc0224eb0e7591d25600bb560852ca9a5..00f052638b19a77c9f9ed0f0435e37f683596c81 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,6 +86,9 @@ install_system_dirs:
        $(INSTALL_ROOT_DIR) $(DESTDIR)$(DEFAULT_LOCK_DIR)
        $(INSTALL_ROOT_DATA) /dev/null $(DESTDIR)$(DEFAULT_CACHE_DIR)/.cache
 
+install_initscripts: 
+       $(MAKE) -C scripts install_initscripts
+
 LCOV_TRACES = libdm.info lib.info tools.info \
        daemons/dmeventd.info daemons/clvmd.info
 CLEAN_TARGETS += $(LCOV_TRACES)

diff --git a/WHATS_NEW b/WHATS_NEW
index 096537cda46bb91d527498d1e01707af1c222139..56bbe5f16c19489dd43cbfbece9a3363309e0558 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,6 +1,6 @@
 Version 2.02.66 - 
 ===============================
-  Add install_system_dirs makefile target.
+  Add install_system_dirs and install_initscripts makefile targets.
   Add configure options for system and locking directories.
   Generate example.conf so default lvm.conf contents can be configured.
   Install lvmconf script by default.

diff --git a/make.tmpl.in b/make.tmpl.in
index a71b7a7266492001bd9f41bb0ba3ed412072262d..3144a885be3095417ef7eab7a960677f7ae78645 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -90,7 +90,7 @@ endif
 # Handle installation of files
 ifeq ("@WRITE_INSTALL@", "yes")
 # leaving defaults
-M_INSTALL_PROGRAM =
+M_INSTALL_SCRIPT =
 M_INSTALL_DATA = -m 644
 else
 M_INSTALL_PROGRAM = -m 555
@@ -100,8 +100,10 @@ INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP)
 INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA)
 INSTALL_WDATA = $(INSTALL) -p -m 644
 
+INSTALL_DIR = $(INSTALL) -m 0755 -d
 INSTALL_ROOT_DIR = $(INSTALL) -m 0700 -d
 INSTALL_ROOT_DATA = $(INSTALL) -m 0600
+INSTALL_SCRIPT = $(INSTALL) -p -m $(M_INSTALL_PROGRAM)
 
 .SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib
 

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index d5206c9e45a752d87b44b0bb742c62dcd106fc4c..2220b9c1a81598aafb95e7d679256f6ec94150dc 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -31,4 +31,15 @@ install_lvm2: $(SCRIPTS:.sh=_install)
 
 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
+ifneq ("@CLVMD@", "none")
+       $(INSTALL_SCRIPT) clvmd_init_red_hat $(DESTDIR)/etc/rc.d/init.d/clvmd
+endif
+ifeq ("@BUILD_CMIRRORD@", "yes")
+       $(INSTALL_SCRIPT) cmirrord_init_red_hat $(DESTDIR)/etc/rc.d/init.d/cmirrord
+endif
+
 DISTCLEAN_TARGETS += clvmd_init_red_hat cmirrord_init_red_hat lvm2_monitoring_init_red_hat