--- nagios-plugins-1.4.12/plugins-root/Makefile.am.p1	2008-03-15 01:44:27 +1000
+++ nagios-plugins-1.4.12/plugins-root/Makefile.am	2008-08-12 14:00:19 +1100
@@ -35,32 +35,13 @@ INSTALL_SUID = \
 	p=$$f; \
 	echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
 	$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
-	echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
-	chown root $(DESTDIR)$(libexecdir)/$$p; \
-	echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
-	chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
 	done
 
 install-root: $(noinst_PROGRAMS)
 	@$(INSTALL_SUID)
 
 install-exec-local: $(noinst_PROGRAMS)
-	@TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
-	rm -f $$TMPFILE; \
-	echo > $$TMPFILE; \
-	## See if we can create a setuid root executable in $(libexecdir).
-	## If not, then don't even try to install setuid plugins.
-	can_create_suid_root_executable=no; \
-	chown root $$TMPFILE > /dev/null 2>&1 \
-	  && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
-	  && can_create_suid_root_executable=yes; \
-	rm -f $$TMPFILE; \
-	if test $$can_create_suid_root_executable = yes; then \
-	  $(INSTALL_SUID); \
-	else \
-	  echo "WARNING: insufficient access; not installing setuid plugins"; \
-	  echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
-	fi
+	@$(INSTALL_SUID)
 
 # /* Author Coreutils team sub-citation */
 
--- nagios-plugins-1.4.12/plugins-root/Makefile.in.p1	2008-05-28 09:05:07 +1100
+++ nagios-plugins-1.4.12/plugins-root/Makefile.in	2008-08-12 14:00:19 +1100
@@ -582,10 +582,6 @@ INSTALL_SUID = \
 	p=$$f; \
 	echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
 	$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
-	echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
-	chown root $(DESTDIR)$(libexecdir)/$$p; \
-	echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
-	chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
 	done
 
 
@@ -955,20 +951,7 @@ install-root: $(noinst_PROGRAMS)
 	@$(INSTALL_SUID)
 
 install-exec-local: $(noinst_PROGRAMS)
-	@TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
-	rm -f $$TMPFILE; \
-	echo > $$TMPFILE; \
-	can_create_suid_root_executable=no; \
-	chown root $$TMPFILE > /dev/null 2>&1 \
-	  && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
-	  && can_create_suid_root_executable=yes; \
-	rm -f $$TMPFILE; \
-	if test $$can_create_suid_root_executable = yes; then \
-	  $(INSTALL_SUID); \
-	else \
-	  echo "WARNING: insufficient access; not installing setuid plugins"; \
-	  echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
-	fi
+	@$(INSTALL_SUID)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: