diff options
author | Ton Voon <tonvoon@users.sourceforge.net> | 2006-06-07 07:18:12 +0000 |
---|---|---|
committer | Ton Voon <tonvoon@users.sourceforge.net> | 2006-06-07 07:18:12 +0000 |
commit | b2363e2914cd798f5fa230b31902da906795c9d6 (patch) | |
tree | 53ed207efb0a3524734a0a0f7154570b3cd80e19 | |
parent | 73255d1551f787151a518e35b1fbc175a4150133 (diff) | |
download | monitoring-plugins-b2363e2914cd798f5fa230b31902da906795c9d6.tar.gz |
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
-rw-r--r-- | plugins-root/Makefile.am | 6 | ||||
-rwxr-xr-x | tools/setup | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index 2a2987d7..f5ecc461 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am | |||
@@ -33,7 +33,7 @@ group = nagios | |||
33 | # /* Author Coreutils team - see ACKNOWLEDGEMENTS */ | 33 | # /* Author Coreutils team - see ACKNOWLEDGEMENTS */ |
34 | 34 | ||
35 | INSTALL_SUID = \ | 35 | INSTALL_SUID = \ |
36 | for f in $(EXTRA_PROGRAMS) ; do \ | 36 | for f in $(libexec_PROGRAMS) ; do \ |
37 | p=$$f; \ | 37 | p=$$f; \ |
38 | echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \ | 38 | echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \ |
39 | $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \ | 39 | $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \ |
@@ -43,10 +43,10 @@ INSTALL_SUID = \ | |||
43 | chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ | 43 | chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ |
44 | done | 44 | done |
45 | 45 | ||
46 | install-root: $(EXTRA_PROGRAMS) | 46 | install-root: $(libexec_PROGRAMS) |
47 | @$(INSTALL_SUID) | 47 | @$(INSTALL_SUID) |
48 | 48 | ||
49 | install-exec-local: $(EXTRA_PROGRAMS) | 49 | install-exec-local: $(libexec_PROGRAMS) |
50 | @TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \ | 50 | @TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \ |
51 | rm -f $$TMPFILE; \ | 51 | rm -f $$TMPFILE; \ |
52 | echo > $$TMPFILE; \ | 52 | echo > $$TMPFILE; \ |
diff --git a/tools/setup b/tools/setup index fa04b7b2..94bd077f 100755 --- a/tools/setup +++ b/tools/setup | |||
@@ -29,7 +29,7 @@ fi | |||
29 | # I think gettext no longer necessary, as all necessary files imported from coreutils | 29 | # I think gettext no longer necessary, as all necessary files imported from coreutils |
30 | #autopoint --force | 30 | #autopoint --force |
31 | aclocal -I m4 $extra | 31 | aclocal -I m4 $extra |
32 | libtoolize --force --copy | 32 | #libtoolize --force --copy |
33 | autoheader | 33 | autoheader |
34 | automake --add-missing --force-missing --copy | 34 | automake --add-missing --force-missing --copy |
35 | autoconf | 35 | autoconf |