1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

makefiles: correct install srcdir

When building in other dir, ensure srcdir is used to find helper
script (via vpath) through  $< usage.

Add also missing [INSTALL] prints for some installed files.
This commit is contained in:
Zdenek Kabelac 2024-03-05 22:00:28 +01:00
parent 9d145c17c3
commit d356561465

View File

@ -45,9 +45,11 @@ vpath %.sh $(srcdir)
vpath %.ocf $(srcdir) vpath %.ocf $(srcdir)
%_install: %.sh %_install: %.sh
@echo " [INSTALL] $^"
$(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $(<F)) $(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $(<F))
%_install: %.ocf %_install: %.ocf
@echo " [INSTALL] $^"
$(Q) $(INSTALL_DIR) $(ocf_scriptdir) $(Q) $(INSTALL_DIR) $(ocf_scriptdir)
$(Q) $(INSTALL_SCRIPT) $< $(ocf_scriptdir)/$(basename $(<F)) $(Q) $(INSTALL_SCRIPT) $< $(ocf_scriptdir)/$(basename $(<F))
@ -56,9 +58,10 @@ install_device-mapper: $(DM_SCRIPTS:.sh=_install)
install_ocf: $(OCF_SCRIPTS:.ocf=_install) install_ocf: $(OCF_SCRIPTS:.ocf=_install)
install_libexec: install_libexec: lvresize_fs_helper.sh
@echo " [INSTALL] $^"
$(Q) $(INSTALL_DIR) $(libexecdir) $(Q) $(INSTALL_DIR) $(libexecdir)
$(Q) $(INSTALL_SCRIPT) lvresize_fs_helper.sh $(libexecdir)/lvresize_fs_helper $(Q) $(INSTALL_SCRIPT) $< $(libexecdir)/$(basename $(<F))
install: install_lvm2 install_ocf install_device-mapper install: install_lvm2 install_ocf install_device-mapper
@ -122,6 +125,9 @@ install_tmpfiles_configuration:
$(Q) $(INSTALL_DIR) $(tmpfiles_dir) $(Q) $(INSTALL_DIR) $(tmpfiles_dir)
$(Q) $(INSTALL_DATA) lvm2_tmpfiles_red_hat.conf $(tmpfiles_dir)/lvm2.conf $(Q) $(INSTALL_DATA) lvm2_tmpfiles_red_hat.conf $(tmpfiles_dir)/lvm2.conf
.PHONY: install_systemd_units install_initscripts
.PHONY: install_libexec install_ocf
DISTCLEAN_TARGETS += \ DISTCLEAN_TARGETS += \
blkdeactivate.sh \ blkdeactivate.sh \
blk_availability_init_red_hat \ blk_availability_init_red_hat \