Separate cache owner from --enable-setuid option

It's useful to have a notion of the cache owner even when man is not
installed setuid.  --enable-setuid no longer takes an argument, and the
owner is now set by the --enable-cache-owner option instead.

* m4/man-arg-cache-owner.m4: New file.
* m4/man-arg-setuid.m4: Stop accepting an argument.  Only set man_mode,
not man_owner.
* configure.ac: Call MAN_ARG_CACHE_OWNER.
* src/Makefile.am (install-exec-hook): Only chown man and mandb if
man_mode is 4755 (as well as the existing test for man_owner being
non-empty).

32 files changed, 114 insertions, 35 deletions

diff --git a/Makefile.in b/Makefile.in
index 05d9fbd3..5349805d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,6 +91,7 @@ subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/aclocal.m4 b/aclocal.m4
index 9b4801bf..4e89b4ec 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1524,6 +1524,7 @@ AC_SUBST([am__untar])
 
 m4_include([m4/man-arg-automatic-create.m4])
 m4_include([m4/man-arg-automatic-update.m4])
+m4_include([m4/man-arg-cache-owner.m4])
 m4_include([m4/man-arg-cats.m4])
 m4_include([m4/man-arg-config-file.m4])
 m4_include([m4/man-arg-db.m4])
diff --git a/config.h.in b/config.h.in
index f07bce33..522c1d31 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1971,7 +1971,7 @@
 /* Define if vasnprintf exists but is overridden by gnulib. */
 #undef REPLACE_VASNPRINTF
 
-/* Define as the setuid owner of man or undefine if not installing setuid. */
+/* Define as the owner of system-wide cache files. */
 #undef SECURE_MAN_UID
 
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
diff --git a/configure b/configure
index 9219bd2d..90db93e7 100755
--- a/configure
+++ b/configure
@@ -1678,6 +1678,7 @@ with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+enable_cache_owner
 enable_setuid
 enable_undoc
 with_device
@@ -2374,7 +2375,11 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-setuid=ARG     install man setuid to user ARG [ARG=man]
+  --enable-cache-owner=ARG
+                          make system-wide cache files be owned by user ARG
+                          [arg=man]
+  --disable-cache-owner   don't constrain ownership of system-wide cache files
+  --enable-setuid         install man setuid
   --disable-setuid        don't install man setuid
   --enable-undoc=COMMAND  suggest COMMAND for missing manual pages
   --enable-automatic-create
@@ -13782,23 +13787,21 @@ roff_version=`echo 2.7.5 | sed 's/-/\\-/g'`
 # The autoconf literature states that only features that can be separately
 # 'built' should use --enable and friends. Oh well...
 
-# Check whether --enable-setuid was given.
-if test "${enable_setuid+set}" = set; then :
-  enableval=$enable_setuid; if test "$enableval" = "yes"
+# Check whether --enable-cache-owner was given.
+if test "${enable_cache_owner+set}" = set; then :
+  enableval=$enable_cache_owner; if test "$enableval" = "yes"
 	   then
 		enableval=man
 	   fi
 	   if test "$enableval" = "no"
 	   then
 		man_owner=
-		man_mode="755"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: Man will not be installed setuid" >&5
-$as_echo "$as_me: Man will not be installed setuid" >&6;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: System-wide cache files will have unconstrained ownership" >&5
+$as_echo "$as_me: System-wide cache files will have unconstrained ownership" >&6;}
 	   else
 		man_owner=$enableval
-		man_mode="4755"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: Man will be installed setuid $enableval" >&5
-$as_echo "$as_me: Man will be installed setuid $enableval" >&6;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: System-wide cache files will be owned by $enableval" >&5
+$as_echo "$as_me: System-wide cache files will be owned by $enableval" >&6;}
 
 cat >>confdefs.h <<_ACEOF
 #define SECURE_MAN_UID "$man_owner"
@@ -13807,7 +13810,6 @@ _ACEOF
 	   fi
 else
   man_owner=man
-	   man_mode="4755"
 	   cat >>confdefs.h <<_ACEOF
 #define SECURE_MAN_UID "$man_owner"
 _ACEOF
@@ -13817,6 +13819,31 @@ fi
 
 
 
+# Check whether --enable-setuid was given.
+if test "${enable_setuid+set}" = set; then :
+  enableval=$enable_setuid; if test "$enableval" = "yes"
+	   then
+		if test -z "$man_owner"
+		then
+			as_fn_error $? "--enable-setuid is incompatible with --disable-cache-owner" "$LINENO" 5
+		fi
+		man_mode="4755"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: Man will be installed setuid $man_owner" >&5
+$as_echo "$as_me: Man will be installed setuid $man_owner" >&6;}
+	   elif test "$enableval" = "no"
+	   then
+		man_mode="755"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: Man will not be installed setuid" >&5
+$as_echo "$as_me: Man will not be installed setuid" >&6;}
+	   else
+		as_fn_error $? "--enable-setuid=$enableval is no longer valid; consider --enable-cache-owner=$enableval --enable-setuid instead" "$LINENO" 5
+	   fi
+else
+  man_mode="4755"
+fi
+
+
+
 
 # Check whether --enable-undoc was given.
 if test "${enable_undoc+set}" = set; then :
diff --git a/configure.ac b/configure.ac
index c8339f37..0c150131 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@ AC_SUBST([roff_version])dnl
 # We have to be a bit naughty here and supply options.
 # The autoconf literature states that only features that can be separately
 # 'built' should use --enable and friends. Oh well...
+MAN_ARG_CACHE_OWNER
 MAN_ARG_SETUID
 MAN_ARG_UNDOC
 MAN_ARG_DEVICE
diff --git a/docs/Makefile.in b/docs/Makefile.in
index d4222f61..1fb6b0f8 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -91,6 +91,7 @@ subdir = docs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
index 21426283..42fd80f6 100644
--- a/gnulib/lib/Makefile.in
+++ b/gnulib/lib/Makefile.in
@@ -116,6 +116,7 @@ subdir = gnulib/lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/init/Makefile.in b/init/Makefile.in
index b9df7482..a087533e 100644
--- a/init/Makefile.in
+++ b/init/Makefile.in
@@ -90,6 +90,7 @@ subdir = init
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/init/systemd/Makefile.in b/init/systemd/Makefile.in
index 4d3d9c22..84e8e66e 100644
--- a/init/systemd/Makefile.in
+++ b/init/systemd/Makefile.in
@@ -91,6 +91,7 @@ subdir = init/systemd
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 26e84b27..9f4601b8 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -92,6 +92,7 @@ subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/libdb/Makefile.in b/libdb/Makefile.in
index d11a7421..036fc6c6 100644
--- a/libdb/Makefile.in
+++ b/libdb/Makefile.in
@@ -92,6 +92,7 @@ subdir = libdb
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/m4/man-arg-cache-owner.m4 b/m4/man-arg-cache-owner.m4
new file mode 100644
index 00000000..dae9ecc3
--- /dev/null
+++ b/m4/man-arg-cache-owner.m4
@@ -0,0 +1,27 @@
+# man-arg-cache-owner.m4 serial 1
+dnl MAN_ARG_CACHE_OWNER
+dnl Add an --enable-cache-owner option.
+
+AC_DEFUN([MAN_ARG_CACHE_OWNER],
+[
+AC_ARG_ENABLE([cache-owner],
+[AS_HELP_STRING([--enable-cache-owner[=ARG]], [make system-wide cache files be owned by user ARG [arg=man]])
+AS_HELP_STRING([--disable-cache-owner], [don't constrain ownership of system-wide cache files])],
+	  [if test "$enableval" = "yes" 
+	   then
+		enableval=man
+	   fi
+	   if test "$enableval" = "no" 
+	   then
+		man_owner=
+		AC_MSG_NOTICE([System-wide cache files will have unconstrained ownership])
+	   else
+		man_owner=$enableval
+		AC_MSG_NOTICE([System-wide cache files will be owned by $enableval])
+	   	AC_DEFINE_UNQUOTED([SECURE_MAN_UID], ["$man_owner"],
+				   [Define as the owner of system-wide cache files.])
+	   fi],
+	  [man_owner=man
+	   AC_DEFINE_UNQUOTED([SECURE_MAN_UID], ["$man_owner"])])
+AC_SUBST([man_owner])
+])
diff --git a/m4/man-arg-setuid.m4 b/m4/man-arg-setuid.m4
index e8de9e04..d5a89bfc 100644
--- a/m4/man-arg-setuid.m4
+++ b/m4/man-arg-setuid.m4
@@ -1,31 +1,27 @@
-# man-arg-setuid.m4 serial 1
+# man-arg-setuid.m4 serial 2
 dnl MAN_ARG_SETUID
 dnl Add an --enable-setuid option.
 
 AC_DEFUN([MAN_ARG_SETUID],
 [
 AC_ARG_ENABLE([setuid],
-[AS_HELP_STRING([--enable-setuid[=ARG]], [install man setuid to user ARG [ARG=man]])
+[AS_HELP_STRING([--enable-setuid], [install man setuid])
 AS_HELP_STRING([--disable-setuid], [don't install man setuid])],
 	  [if test "$enableval" = "yes" 
 	   then
-		enableval=man
-	   fi
-	   if test "$enableval" = "no" 
+		if test -z "$man_owner"
+		then
+			AC_MSG_ERROR([--enable-setuid is incompatible with --disable-cache-owner])
+		fi
+		man_mode="4755"
+		AC_MSG_NOTICE([Man will be installed setuid $man_owner])
+	   elif test "$enableval" = "no" 
 	   then
-		man_owner=
 		man_mode="755"
 		AC_MSG_NOTICE([Man will not be installed setuid])
 	   else
-		man_owner=$enableval
-		man_mode="4755"
-		AC_MSG_NOTICE([Man will be installed setuid $enableval])
-	   	AC_DEFINE_UNQUOTED([SECURE_MAN_UID], ["$man_owner"],
-				   [Define as the setuid owner of man or undefine if not installing setuid.])
+		AC_MSG_ERROR([--enable-setuid=$enableval is no longer valid; consider --enable-cache-owner=$enableval --enable-setuid instead])
 	   fi],
-	  [man_owner=man
-	   man_mode="4755"
-	   AC_DEFINE_UNQUOTED([SECURE_MAN_UID], ["$man_owner"])])
-AC_SUBST([man_owner])
+	  [man_mode="4755"])
 AC_SUBST([man_mode])
 ])
diff --git a/man/Makefile.in b/man/Makefile.in
index c914f247..e7e8bf39 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -90,6 +90,7 @@ subdir = man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/da/Makefile.in b/man/da/Makefile.in
index ff7223e0..5aa23a57 100644
--- a/man/da/Makefile.in
+++ b/man/da/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/da
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/de/Makefile.in b/man/de/Makefile.in
index b0a06d3b..172b8345 100644
--- a/man/de/Makefile.in
+++ b/man/de/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/de
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/es/Makefile.in b/man/es/Makefile.in
index 30e2b754..65d6472a 100644
--- a/man/es/Makefile.in
+++ b/man/es/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/es
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in
index 1232d6b1..eadd2b01 100644
--- a/man/fr/Makefile.in
+++ b/man/fr/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/fr
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/id/Makefile.in b/man/id/Makefile.in
index d7c32b91..4f293b69 100644
--- a/man/id/Makefile.in
+++ b/man/id/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/id
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/it/Makefile.in b/man/it/Makefile.in
index 9896bfec..0e3eb9d5 100644
--- a/man/it/Makefile.in
+++ b/man/it/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/it
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in
index a12bdd9d..e61b66bb 100644
--- a/man/ja/Makefile.in
+++ b/man/ja/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/ja
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/nl/Makefile.in b/man/nl/Makefile.in
index 9a57f755..df36f139 100644
--- a/man/nl/Makefile.in
+++ b/man/nl/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/nl
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/pl/Makefile.in b/man/pl/Makefile.in
index 0bf4ba64..99cecac0 100644
--- a/man/pl/Makefile.in
+++ b/man/pl/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/pl
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/po4a/Makefile.in b/man/po4a/Makefile.in
index 0faeb0cd..6d26dd42 100644
--- a/man/po4a/Makefile.in
+++ b/man/po4a/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/po4a
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in
index e7ce9c0f..4707bfd1 100644
--- a/man/ru/Makefile.in
+++ b/man/ru/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/ru
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/sv/Makefile.in b/man/sv/Makefile.in
index 0d75fe23..06801193 100644
--- a/man/sv/Makefile.in
+++ b/man/sv/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/sv
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/man/zh_CN/Makefile.in b/man/zh_CN/Makefile.in
index fd35ad44..1b4e3651 100644
--- a/man/zh_CN/Makefile.in
+++ b/man/zh_CN/Makefile.in
@@ -90,6 +90,7 @@ subdir = man/zh_CN
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/manual/Makefile.in b/manual/Makefile.in
index 95e9d723..364a6889 100644
--- a/manual/Makefile.in
+++ b/manual/Makefile.in
@@ -91,6 +91,7 @@ subdir = manual
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/src/Makefile.am b/src/Makefile.am
index d485ef42..4159fd23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -173,10 +173,11 @@ apropos$(EXEEXT): whatis$(EXEEXT)
 all-am: apropos$(EXEEXT)
 
 install-exec-hook:
-	-test -z "$(man_owner)" || \
-	chown $(man_owner) \
-		$(DESTDIR)$(bindir)/$(TRANS_MAN) \
-		$(DESTDIR)$(bindir)/$(TRANS_MANDB)
+	if [ "$(man_owner)" ] && [ "$(man_mode)" = 4755 ]; then \
+		chown $(man_owner) \
+			$(DESTDIR)$(bindir)/$(TRANS_MAN) \
+			$(DESTDIR)$(bindir)/$(TRANS_MANDB); \
+	fi
 	chmod $(man_mode) \
 		$(DESTDIR)$(bindir)/$(TRANS_MAN) \
 		$(DESTDIR)$(bindir)/$(TRANS_MANDB)
diff --git a/src/Makefile.in b/src/Makefile.in
index a6a71837..c3f2db86 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -97,6 +97,7 @@ subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
@@ -2209,10 +2210,11 @@ apropos$(EXEEXT): whatis$(EXEEXT)
 all-am: apropos$(EXEEXT)
 
 install-exec-hook:
-	-test -z "$(man_owner)" || \
-	chown $(man_owner) \
-		$(DESTDIR)$(bindir)/$(TRANS_MAN) \
-		$(DESTDIR)$(bindir)/$(TRANS_MANDB)
+	if [ "$(man_owner)" ] && [ "$(man_mode)" = 4755 ]; then \
+		chown $(man_owner) \
+			$(DESTDIR)$(bindir)/$(TRANS_MAN) \
+			$(DESTDIR)$(bindir)/$(TRANS_MANDB); \
+	fi
 	chmod $(man_mode) \
 		$(DESTDIR)$(bindir)/$(TRANS_MAN) \
 		$(DESTDIR)$(bindir)/$(TRANS_MANDB)
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 913df723..ca61c6e2 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -91,6 +91,7 @@ subdir = src/tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \
diff --git a/tools/Makefile.in b/tools/Makefile.in
index e415bb98..bbd52d30 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -92,6 +92,7 @@ subdir = tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \
 	$(top_srcdir)/m4/man-arg-automatic-update.m4 \
+	$(top_srcdir)/m4/man-arg-cache-owner.m4 \
 	$(top_srcdir)/m4/man-arg-cats.m4 \
 	$(top_srcdir)/m4/man-arg-config-file.m4 \
 	$(top_srcdir)/m4/man-arg-db.m4 \