Prefer install -s over install followed by strip (resolves NagiosEnte…

…rprises#420) (NagiosEnterprises#667) * Prefer install -s over install followed by strip (resolves NagiosEnterprises#420)
hedenface · Jul 23, 2019 · f120e76 · f120e76
1 parent d375ec8
commit f120e76
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 27 deletions.
diff --git a/base/Makefile.in b/base/Makefile.in
@@ -173,19 +173,13 @@ devclean: distclean
 	rm -f wpres-phash.h
 
 install:
-	$(MAKE) install-basic
-	$(MAKE) strip-post-install
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) -s -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+	$(INSTALL) -s -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
 
 install-unstripped:
-	$(MAKE) install-basic
-
-install-basic:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
-
-strip-post-install:
-	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
-	$(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@
+	$(INSTALL) -m 774 $(INSTALL_OPTS) nagios $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 774 $(INSTALL_OPTS) nagiostats $(DESTDIR)$(BINDIR)
 
 .PHONY: libnagios
diff --git a/cgi/Makefile.in b/cgi/Makefile.in
@@ -195,21 +195,17 @@ devclean: distclean
 
 install:
 	$(MAKE) install-basic
-	$(MAKE) strip-post-install
 
 install-unstripped:
-	$(MAKE) install-basic
-
-install-basic:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
 	for file in *.cgi; do \
 		$(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
 	done
 
-strip-post-install:
+install-basic:
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
 	for file in *.cgi; do \
-		$(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \
+		$(INSTALL) -s -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
 	done
 
-
 .PHONY: libnagios
diff --git a/worker/ping/Makefile.in b/worker/ping/Makefile.in
@@ -41,15 +41,9 @@ distclean: clean
 devclean: distclean
 
 install:
-	$(MAKE) install-basic
-	$(MAKE) strip-post-install
-
-install-unstripped:
-	$(MAKE) install-basic
-
-install-basic:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
 	$(INSTALL) -m 774 $(INSTALL_OPTS) worker-ping $(DESTDIR)$(BINDIR)
 
-strip-post-install:
-	$(STRIP) $(DESTDIR)$(BINDIR)/worker-ping
+install-unstripped:
+	$(INSTALL) -s -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) -s -m 774 $(INSTALL_OPTS) worker-ping $(DESTDIR)$(BINDIR)