makefiles: Revert most of 456b659

Must not use DESTDIR with --basedir.

Reverts: 456b659b4edfc758b5aa0b72af25677a4f5042ea

diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in
index 56d5c6602de84113c36cdc84925f728f70161746..dee37122a5149612679638fe51fac9ceca975192 100644 (file)
--- 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 = $(DESTDIR)$(python3dir)/lvmdbusd
+lvmdbusdir = $(python3dir)/lvmdbusd
 
 LVMDBUS_SRCDIR_FILES = \
        automatedproperties.py \
@@ -57,12 +57,12 @@ install_lvmdbusd: $(LVMDBUSD)
        @echo "    [INSTALL] $<"
        $(Q) $(INSTALL_DIR) $(sbindir)
        $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir)
-       $(Q) $(INSTALL_DIR) $(lvmdbusdir)
-       $(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(lvmdbusdir))
-       $(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(lvmdbusdir)
+       $(Q) $(INSTALL_DIR) $(DESTDIR)$(lvmdbusdir)
+       $(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(DESTDIR)$(lvmdbusdir))
+       $(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(DESTDIR)$(lvmdbusdir)
        $(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbusdir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES)
-       $(Q) $(CHMOD) 755 $(lvmdbusdir)/__pycache__
-       $(Q) $(CHMOD) 444 $(lvmdbusdir)/__pycache__/*.py[co]
+       $(Q) $(CHMOD) 755 $(DESTDIR)$(lvmdbusdir)/__pycache__
+       $(Q) $(CHMOD) 444 $(DESTDIR)$(lvmdbusdir)/__pycache__/*.py[co]
 
 install_lvm2: install_lvmdbusd