oops, references to the server /var/log/amanda directory in rules, too

[debian/amanda] / config / automake / installperms.am

diff --git a/config/automake/installperms.am b/config/automake/installperms.am
index 245345bb18ae7f4a0a4c002c31c00f69332396cc..e69c1e6633b1ab30b3d654231f25cdf014f8f6df 100644 (file)
--- a/config/automake/installperms.am
+++ b/config/automake/installperms.am
@@ -9,10 +9,12 @@
 #  - chown= controls changes in ownership; value is first argument to chown
 #  - chmod= controls changes in permissions; value is first argument to chmod
 #
-# As a special case, chown=amanda is taken as equivalent to 
-# chown=$(BINARY_OWNER):$(SETUID_GROUP), which may otherwise have problems with
-# whitespace in the user/group names.
-# 
+# The following special cases are available:
+#      amanda:setuid = $(BINARY_OWNER):$(SETUID_GROUP)
+#      root:setuid = root:$(SETUID_GROUP)
+# These variables might otherwise have problems with whitespace in the user/group
+# names.
+#
 # when a filename is seen, the currently active variables are applied.
 #
 # Note that scripts are data, not executables!
@@ -25,7 +27,7 @@
 # INSTALLPERMS_exec = \
 #      dest=$(sbindir) chown=amanda chmod= \
 #              foo bar \
-#      chmod=u+s,o-rwx \
+#      chmod=07450 \
 #              bing
 #      dest=$(libexecdir) chmod= \
 #              $(libexec_PROGRAMS)
@@ -35,57 +37,71 @@
 #
 # This whole operation is not required when making builds for packaging,
 # and can be disabled with --disable-installperms, via the WANT_INSTALLPERMS
-# AM_CONDITIONAL.
+# AM_CONDITIONAL.  When disabled, the file 'installperms.sh' in the top-level
+# build directory is populated with a format suitable for shell interpretation,
+# with lines like this:
+#   installperm "amanda:disk" "04750" "/usr/local/sbin/bing"
+# the arguments being, respectively, owner:group, mode, and filename.  There will
+# be exactly one line for each file which has specific permissions.  The intention
+# is that this file be used by packaging scripts to set correct permissions at install
+# time.  Note that files which have no special permissions requirements do not appear 
+# in this file at all, due to limitations of Automake.
 
 # sed expression to strip leading directories from a filename; this converts e.g.,
 # src/foo/bar.so to bar.so.
 strip_leading_dirs=s|^.*/||
 
+# define a snippet of the scripts below to either perform a chown/chmod operation,
+# or record that operation in the logfile.  On entry to the snippet, $$dest is the
+# destination directory, $$cmd is the srcdir-relative pathname of the target file,
+# $$chown is the ownership, and $$chmod is the permission pattern.
 if WANT_INSTALLPERMS
-installperms-exec:
-       @installperms="$(INSTALLPERMS_exec)"; \
-       test -n "$$installperms" && echo "Setting installation permissions on executables"; \
-       dest=; chown=; chmod=; \
+do_file=pa="$(DESTDIR)$$dest"/`echo "$$cmd"|sed '$(strip_leading_dirs)'|sed '$(transform)'`; \
+    if test -n "$$chown"; then \
+       echo chown "$$chown" "$$pa"; \
+       chown "$$chown" "$$pa" || exit 1; \
+    fi; \
+    if test -n "$$chmod"; then \
+       echo chmod "$$chmod" "$$pa"; \
+       chmod "$$chmod" "$$pa" || exit 1; \
+    fi 
+else
+installperms_sh="$(top_builddir)/installperms.sh"
+do_file=pa="$$dest"/`echo "$$cmd"|sed '$(strip_leading_dirs)'|sed '$(transform)'`; \
+    echo "installperm \"$$chown\" \"$$chmod\" \"$$pa\"" >> "$(installperms_sh)"
+DISTCLEANFILES += $(installperms_sh)
+endif
+
+do_installperms=dest=; chown=; chmod=; \
        for cmd in $$installperms; do \
            case "$$cmd" in \
-               chown=amanda) \
-                       echo "  ($$cmd)"; chown="$(BINARY_OWNER):$(SETUID_GROUP)";; \
+               chown=amanda:setuid) \
+                   echo "  ($$cmd)"; chown="$(BINARY_OWNER):$(SETUID_GROUP)";; \
+               chown=root:setuid) \
+                   echo "  ($$cmd)"; chown="root:$(SETUID_GROUP)";; \
                dest=*|chown=*|chmod=*) \
                        echo "  ($$cmd)"; eval $$cmd;; \
-               *)  pa="$(DESTDIR)$$dest"/`echo "$$cmd"|sed '$(strip_leading_dirs)'|sed '$(transform)'`; \
-                   if test -n "$$chown"; then \
-                       echo chown "$$chown" "$$pa"; \
-                       chown "$$chown" "$$pa" || exit 1; \
-                   fi; \
-                   if test -n "$$chmod"; then \
-                       echo chmod "$$chmod" "$$pa"; \
-                       chmod "$$chmod" "$$pa" || exit 1; \
-                   fi; \
+               *) $(do_file) ;; \
            esac; \
        done
 
+installperms-exec:
+       @installperms="$(INSTALLPERMS_exec)"; \
+       test -n "$$installperms" && echo "Setting installation permissions on executables"; \
+       $(do_installperms)
+
 installperms-data:
        @installperms="$(INSTALLPERMS_data)"; \
        test -n "$$installperms" && echo "Setting installation permissions on data"; \
-       dest=; chown=; chmod=; \
-       for cmd in $$installperms; do \
-           case "$$cmd" in \
-               chown=amanda) \
-                       echo "  ($$cmd)"; chown="$(BINARY_OWNER):$(SETUID_GROUP)";; \
-               dest=*|chown=*|chmod=*) \
-                       echo "  ($$cmd)"; eval $$cmd;; \
-               *)  pa="$(DESTDIR)$$dest"/`echo "$$cmd"|sed '$(strip_leading_dirs)'|sed '$(transform)'`; \
-                   if test -n "$$chown"; then \
-                       echo chown "$$chown" "$$pa"; \
-                       chown "$$chown" "$$pa" || exit 1; \
-                   fi; \
-                   if test -n "$$chmod"; then \
-                       echo chmod "$$chmod" "$$pa"; \
-                       chmod "$$chmod" "$$pa" || exit 1; \
-                   fi; \
-           esac; \
-       done
+       $(do_installperms)
 
 install-exec-hook: installperms-exec
 install-data-hook: installperms-data
+
+# define a rule to initialize the installperms manifest file
+if WANT_INSTALLPERMS
+installperms-init:
+else
+installperms-init:
+       rm -f "$(installperms_sh)"
 endif