Merge commit 'upstream/3.2.0'

[debian/amanda] / client-src / Makefile.am

diff --git a/client-src/Makefile.am b/client-src/Makefile.am
index b0942bde921d3032c76947c2fb7296e2f6fdbe90..e7dea7ba74113e894d721fddda44c10bc246aa17 100644 (file)
--- a/client-src/Makefile.am
+++ b/client-src/Makefile.am
@@ -18,12 +18,11 @@ LINTFLAGS=$(AMLINTFLAGS)
 
 amlib_LTLIBRARIES =    libamclient.la
 
-amlibexec_PROGRAMS =   noop calcsize killpgrp rundump runtar selfcheck sendbackup sendsize versionsuffix
+amlibexec_PROGRAMS =   noop calcsize killpgrp rundump runtar selfcheck sendbackup sendsize
 
 amlibexec_SCRIPTS = patch-system
 
-CHECK_PERL = $(sbin_SCRIPTS)
-SCRIPTS_PERL = $(CHECK_PERL)
+SCRIPTS_PERL = $(sbin_SCRIPTS)
 SCRIPTS_SHELL = $(amlibexec_SCRIPTS)
 
 libamclient_la_SOURCES=        amandates.c             getfsent.c      \
@@ -62,15 +61,8 @@ sendbackup_SOURCES =         sendbackup.c            sendbackup.h      \
 noinst_HEADERS =       amandates.h     getfsent.h      \
                        findpass.h      client_util.h
                        
-INSTALLPERMS_exec = chown=amanda \
-       dest=$(amlibexecdir) $(amlibexec_PROGRAMS)
-
-INSTALLPERMS_data = chown=amanda \
-       dest=$(sbindir) $(sbin_SCRIPTS) \
-       dest=$(amlibexecdir) $(amlibexec_SCRIPTS)
-
 if WANT_SETUID_CLIENT
-INSTALLPERMS_exec += dest=$(amlibexecdir) chown=root chmod=04750 \
+INSTALLPERMS_exec = dest=$(amlibexecdir) chown=root:setuid chmod=04750 \
                calcsize killpgrp rundump runtar
 endif