[lldp-devel] [PATCH 1/3] Do not install systemd files as executable

Hannes Reinecke hare at suse.de
Tue Nov 19 11:46:00 UTC 2013


systemd files are normal files, so they don't need to have the
executable bit set.

Signed-off-by: Hannes Reinecke <hare at suse.de>
---
 Makefile.am | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9f77b18..4b07191 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,24 +121,21 @@ pkgconfig_DATA = lldpad.pc liblldp_clif.pc
 ## put a spec file and documentation in the distribution archive
 dist_noinst_DATA = lldpad.spec README COPYING ChangeLog
 
-## lldpad.init is listed here because it gets installed from install-data-local
-dist_noinst_SCRIPTS = lldpad.service lldpad.socket
-
 ## special hooks to handle the init script
 install-data-local: lldpad.service lldpad.socket
 	$(MKDIR_P) $(DESTDIR)/usr/lib/systemd/system
-	$(INSTALL_SCRIPT) lldpad.service $(DESTDIR)/usr/lib/systemd/system/lldpad.service
-	$(INSTALL_SCRIPT) lldpad.socket $(DESTDIR)/usr/lib/systemd/system/lldpad.socket
+	$(INSTALL_DATA) lldpad.service $(DESTDIR)/usr/lib/systemd/system/lldpad.service
+	$(INSTALL_DATA) lldpad.socket $(DESTDIR)/usr/lib/systemd/system/lldpad.socket
 
 BASH_COMPLETION_DIR=/etc/bash_completion.d/
 
 install-data-hook:
 	## provide support for bash completion
 	$(MKDIR_P) $(DESTDIR)/$(BASH_COMPLETION_DIR)
-	$(INSTALL_SCRIPT) ${srcdir}/contrib/bash_completion/* $(DESTDIR)/$(BASH_COMPLETION_DIR)
+	$(INSTALL_DATA) ${srcdir}/contrib/bash_completion/* $(DESTDIR)/$(BASH_COMPLETION_DIR)
 
 uninstall-local:
-	rm -f '$(DESTDIR)/etc/init.d/lldpad'
+	rm -f '$(DESTDIR)/usr/lib/systemd/system/lldpad.*'
 	rm -f '$(includedir)/dcbd/clif_cmds.h'
 	rm -f '$(includedir)/dcbd'
 
-- 
1.8.4



More information about the lldp-devel mailing list