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 2a2987d7a5cfd433d633d155d847338f4bed2fc1..f5ecc461b0bca4cc9daabf23535479e9057f61f6 100644 (file)
--- 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 fa04b7b21443661b28c343caa9b3dc149c6ed105..94bd077fa410149fd6d24415c90d9322f3185573 100755 (executable)
--- 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