From 456b659b4edfc758b5aa0b72af25677a4f5042ea Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Tue, 2 Mar 2021 16:29:07 +0100 Subject: [PATCH] makefiles: integrate DESTDIR Always use lvmdbusdir with DESTDIR. --- daemons/lvmdbusd/Makefile.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in index da96c344b..56d5c6602 100644 --- a/daemons/lvmdbusd/Makefile.in +++ b/daemons/lvmdbusd/Makefile.in @@ -15,7 +15,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -lvmdbusdir = $(python3dir)/lvmdbusd +lvmdbusdir = $(DESTDIR)$(python3dir)/lvmdbusd LVMDBUS_SRCDIR_FILES = \ automatedproperties.py \ @@ -53,16 +53,16 @@ include $(top_builddir)/make.tmpl all: $(Q) test -x $(LVMDBUSD) || chmod 755 $(LVMDBUSD) -install_lvmdbusd: +install_lvmdbusd: $(LVMDBUSD) @echo " [INSTALL] $<" $(Q) $(INSTALL_DIR) $(sbindir) $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) - $(Q) $(INSTALL_DIR) $(DESTDIR)$(lvmdbusdir) - $(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(DESTDIR)$(lvmdbusdir)) - $(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(DESTDIR)$(lvmdbusdir) + $(Q) $(INSTALL_DIR) $(lvmdbusdir) + $(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(lvmdbusdir)) + $(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(lvmdbusdir) $(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbusdir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES) - $(Q) $(CHMOD) 755 $(DESTDIR)$(lvmdbusdir)/__pycache__ - $(Q) $(CHMOD) 444 $(DESTDIR)$(lvmdbusdir)/__pycache__/*.py[co] + $(Q) $(CHMOD) 755 $(lvmdbusdir)/__pycache__ + $(Q) $(CHMOD) 444 $(lvmdbusdir)/__pycache__/*.py[co] install_lvm2: install_lvmdbusd