Imported Upstream version 2.6.1

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

diff --git a/client-src/Makefile.am b/client-src/Makefile.am
index fa768ce5dded07f8b5f12c5ad661449b2950b99c..b0942bde921d3032c76947c2fb7296e2f6fdbe90 100644 (file)
--- a/client-src/Makefile.am
+++ b/client-src/Makefile.am
@@ -20,9 +20,6 @@ amlib_LTLIBRARIES =   libamclient.la
 
 amlibexec_PROGRAMS =   noop calcsize killpgrp rundump runtar selfcheck sendbackup sendsize versionsuffix
 
-sbin_SCRIPTS = @CLIENT_SCRIPTS_OPT@
-EXTRA_SCRIPTS =        amhpfixdevs amsinixfixdevs
-
 amlibexec_SCRIPTS = patch-system
 
 CHECK_PERL = $(sbin_SCRIPTS)
@@ -73,12 +70,13 @@ INSTALLPERMS_data = chown=amanda \
        dest=$(amlibexecdir) $(amlibexec_SCRIPTS)
 
 if WANT_SETUID_CLIENT
-INSTALLPERMS_exec += dest=$(amlibexecdir) chown=root chmod=u+s,o-rwx \
+INSTALLPERMS_exec += dest=$(amlibexecdir) chown=root chmod=04750 \
                calcsize killpgrp rundump runtar
 endif
 
 lint:
        @ for p in $(amlibexec_PROGRAMS); do                                    \
+               p=`basename $$p $(EXEEXT)`;                                     \
                f="$$p.c $(libamclient_la_SOURCES)";                            \
                (cd ../common-src; make listlibsrc);                            \
                f="$$f "`cat ../common-src/listlibsrc.output`;                  \