From: Marian Csontos <mcsontos@sourceware.org>
To: lvm-devel@redhat.com
Subject: main - makefiles: Revert most of 456b659
Date: Mon, 8 Mar 2021 13:12:32 +0000 (GMT) [thread overview]
Message-ID: <20210308131232.41E6D394EC02@sourceware.org> (raw)
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e10633394d64d5a1d2434fb0166689bbfb732bef
Commit: e10633394d64d5a1d2434fb0166689bbfb732bef
Parent: 2244a56021475179b8cc3633c8cb6534eaa18025
Author: Marian Csontos <mcsontos@redhat.com>
AuthorDate: Mon Mar 8 13:59:26 2021 +0100
Committer: Marian Csontos <mcsontos@redhat.com>
CommitterDate: Mon Mar 8 13:59:26 2021 +0100
makefiles: Revert most of 456b659
Must not use DESTDIR with --basedir.
Reverts: 456b659b4edfc758b5aa0b72af25677a4f5042ea
---
daemons/lvmdbusd/Makefile.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in
index 56d5c6602..dee37122a 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 = $(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
reply other threads:[~2021-03-08 13:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210308131232.41E6D394EC02@sourceware.org \
--to=mcsontos@sourceware.org \
--cc=lvm-devel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.