Просмотр исходного кода

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
Ton Voon 19 лет назад
Родитель
Сommit
b2363e2914
2 измененных файлов с 4 добавлено и 4 удалено
  1. 3 3
      plugins-root/Makefile.am
  2. 1 1
      tools/setup

+ 3 - 3
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; \

+ 1 - 1
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