From 7171260b94250dd7fdc37ce1dfdbb401159d2abe Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Thu, 13 Jul 2023 16:36:49 +0200
Subject: [PATCH] makefiles: install lvmdbusd executable

Use a different mechanism to ensure, lvmdbudd is executable at
install destination.
---
 daemons/lvmdbusd/Makefile.in           | 6 +-----
 daemons/lvmdbusd/lvm_shell_proxy.py.in | 0
 make.tmpl.in                           | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 daemons/lvmdbusd/lvm_shell_proxy.py.in

diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in
index d9cf5d886..9c2629279 100644
--- a/daemons/lvmdbusd/Makefile.in
+++ b/daemons/lvmdbusd/Makefile.in
@@ -51,18 +51,14 @@ include $(top_builddir)/make.tmpl
 
 .PHONY: install_lvmdbusd
 
-all:
-	$(Q) test -x $(LVMDBUSD) || chmod 755 $(LVMDBUSD)
-
 install_lvmdbusd: $(LVMDBUSD)
 	@echo "    [INSTALL] $<"
 	$(Q) $(INSTALL_DIR) $(sbindir)
 	$(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir)
-	$(Q) $(INSTALL_DIR) $(lvmdbusdir)
+	$(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__
 	$(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(lvmdbusdir))
 	$(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(lvmdbusdir)
 	$(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbuspydir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES)
-	$(Q) $(CHMOD) 755 $(lvmdbusdir)/__pycache__
 	$(Q) $(CHMOD) 444 $(lvmdbusdir)/__pycache__/*.py[co]
 
 install_lvm2: install_lvmdbusd
diff --git a/daemons/lvmdbusd/lvm_shell_proxy.py.in b/daemons/lvmdbusd/lvm_shell_proxy.py.in
old mode 100755
new mode 100644
diff --git a/make.tmpl.in b/make.tmpl.in
index 20f8a5245..fcb62f78a 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -203,7 +203,7 @@ endif
 # Handle installation of files
 ifeq ("@WRITE_INSTALL@", "yes")
 # leaving defaults
-M_INSTALL_SCRIPT =
+M_INSTALL_SCRIPT = -m 755
 M_INSTALL_DATA = -m 644
 else
 M_INSTALL_PROGRAM = -m 555