From: Ton Voon <tonvoon@users.sourceforge.net>
Date: Wed, 7 Jun 2006 07:18:12 +0000 (+0000)
Subject: Fixed two build problems re: libtool and pst3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b2363e2914cd798f5fa230b31902da906795c9d6;p=nagiosplug.git

Fixed two build problems re: libtool and pst3


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1415 f882894a-f735-0410-b71e-b25c423dba1c
---

diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 2a2987d..f5ecc46 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -33,7 +33,7 @@ group = nagios
 # /* Author Coreutils team - see ACKNOWLEDGEMENTS */
 
 INSTALL_SUID = \
-	for f in $(EXTRA_PROGRAMS) ; do \
+	for f in $(libexec_PROGRAMS) ; do \
 	p=$$f; \
 	echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
 	$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
@@ -43,10 +43,10 @@ INSTALL_SUID = \
 	chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
 	done
 
-install-root: $(EXTRA_PROGRAMS)
+install-root: $(libexec_PROGRAMS)
 	@$(INSTALL_SUID)
 
-install-exec-local: $(EXTRA_PROGRAMS)
+install-exec-local: $(libexec_PROGRAMS)
 	@TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
 	rm -f $$TMPFILE; \
 	echo > $$TMPFILE; \
diff --git a/tools/setup b/tools/setup
index fa04b7b..94bd077 100755
--- a/tools/setup
+++ b/tools/setup
@@ -29,7 +29,7 @@ fi
 # I think gettext no longer necessary, as all necessary files imported from coreutils
 #autopoint --force
 aclocal -I m4 $extra
-libtoolize --force --copy
+#libtoolize --force --copy
 autoheader
 automake --add-missing --force-missing --copy
 autoconf