mirror of
https://github.com/sudo-project/sudo.git
synced 2025-09-03 15:55:40 +00:00
Replace out of date MAN_POSTINSTALL with MANCOMPRESS and MANCOMPRESSEXT
which can be used to compress the installed manual pages. Compress the man pages for .deb files to appease lintian.
This commit is contained in:
8
configure
vendored
8
configure
vendored
@@ -724,7 +724,8 @@ DEVEL
|
|||||||
SUDOERS_GID
|
SUDOERS_GID
|
||||||
SUDOERS_UID
|
SUDOERS_UID
|
||||||
SUDOERS_MODE
|
SUDOERS_MODE
|
||||||
MAN_POSTINSTALL
|
MANCOMPRESSEXT
|
||||||
|
MANCOMPRESS
|
||||||
MANTYPE
|
MANTYPE
|
||||||
AUTH_OBJS
|
AUTH_OBJS
|
||||||
OSDEFS
|
OSDEFS
|
||||||
@@ -2876,6 +2877,7 @@ $as_echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;}
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -14078,7 +14080,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|||||||
*-*-irix*)
|
*-*-irix*)
|
||||||
OSDEFS="${OSDEFS} -D_BSD_TYPES"
|
OSDEFS="${OSDEFS} -D_BSD_TYPES"
|
||||||
if test -z "$NROFFPROG"; then
|
if test -z "$NROFFPROG"; then
|
||||||
MAN_POSTINSTALL=' /bin/rm -f $(mandirsu)/sudo.$(mansectsu).z $(mandirsu)/visudo.$(mansectsu).z $(mandirform)/sudoers.$(mansectform).z ; /usr/bin/pack $(mandirsu)/sudo.$(mansectsu) $(mandirsu)/visudo.$(mansectsu) $(mandirform)/sudoers.$(mansectform)'
|
|
||||||
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
||||||
if test -d /usr/share/catman/local; then
|
if test -d /usr/share/catman/local; then
|
||||||
mandir="/usr/share/catman/local"
|
mandir="/usr/share/catman/local"
|
||||||
@@ -14086,6 +14087,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|||||||
mandir="/usr/catman/local"
|
mandir="/usr/catman/local"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
# Compress cat pages with pack
|
||||||
|
MANCOMPRESS='pack'
|
||||||
|
MANCOMPRESSEXT='.z'
|
||||||
else
|
else
|
||||||
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
||||||
if test -d "/usr/share/man/local"; then
|
if test -d "/usr/share/man/local"; then
|
||||||
|
@@ -34,7 +34,8 @@ AC_SUBST([GETGROUPS_LIB])
|
|||||||
AC_SUBST([OSDEFS])
|
AC_SUBST([OSDEFS])
|
||||||
AC_SUBST([AUTH_OBJS])
|
AC_SUBST([AUTH_OBJS])
|
||||||
AC_SUBST([MANTYPE])
|
AC_SUBST([MANTYPE])
|
||||||
AC_SUBST([MAN_POSTINSTALL])
|
AC_SUBST([MANCOMPRESS])
|
||||||
|
AC_SUBST([MANCOMPRESSEXT])
|
||||||
AC_SUBST([SUDOERS_MODE])
|
AC_SUBST([SUDOERS_MODE])
|
||||||
AC_SUBST([SUDOERS_UID])
|
AC_SUBST([SUDOERS_UID])
|
||||||
AC_SUBST([SUDOERS_GID])
|
AC_SUBST([SUDOERS_GID])
|
||||||
@@ -1694,7 +1695,6 @@ case "$host" in
|
|||||||
*-*-irix*)
|
*-*-irix*)
|
||||||
OSDEFS="${OSDEFS} -D_BSD_TYPES"
|
OSDEFS="${OSDEFS} -D_BSD_TYPES"
|
||||||
if test -z "$NROFFPROG"; then
|
if test -z "$NROFFPROG"; then
|
||||||
MAN_POSTINSTALL=' /bin/rm -f $(mandirsu)/sudo.$(mansectsu).z $(mandirsu)/visudo.$(mansectsu).z $(mandirform)/sudoers.$(mansectform).z ; /usr/bin/pack $(mandirsu)/sudo.$(mansectsu) $(mandirsu)/visudo.$(mansectsu) $(mandirform)/sudoers.$(mansectform)'
|
|
||||||
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
||||||
if test -d /usr/share/catman/local; then
|
if test -d /usr/share/catman/local; then
|
||||||
mandir="/usr/share/catman/local"
|
mandir="/usr/share/catman/local"
|
||||||
@@ -1702,6 +1702,9 @@ case "$host" in
|
|||||||
mandir="/usr/catman/local"
|
mandir="/usr/catman/local"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
# Compress cat pages with pack
|
||||||
|
MANCOMPRESS='pack'
|
||||||
|
MANCOMPRESSEXT='.z'
|
||||||
else
|
else
|
||||||
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
if test "$prefix" = "/usr/local" -a "$mandir" = '${datarootdir}/man'; then
|
||||||
if test -d "/usr/share/man/local"; then
|
if test -d "/usr/share/man/local"; then
|
||||||
|
@@ -26,6 +26,8 @@ top_srcdir = @top_srcdir@
|
|||||||
|
|
||||||
# Tools to use
|
# Tools to use
|
||||||
NROFF = @NROFFPROG@
|
NROFF = @NROFFPROG@
|
||||||
|
MANCOMPRESS = @MANCOMPRESS@
|
||||||
|
MANCOMPRESSEXT = @MANCOMPRESSEXT@
|
||||||
|
|
||||||
# Our install program supports extra flags...
|
# Our install program supports extra flags...
|
||||||
INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
|
INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
|
||||||
@@ -236,14 +238,24 @@ install-doc: install-dirs
|
|||||||
for f in $(OTHER_DOCS); do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done
|
for f in $(OTHER_DOCS); do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done
|
||||||
@LDAP@for f in $(OTHER_DOCS_LDAP); do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done
|
@LDAP@for f in $(OTHER_DOCS_LDAP); do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done
|
||||||
$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
|
$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
|
||||||
@rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
|
|
||||||
ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
|
|
||||||
$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudo_plugin.$(mantype) $(DESTDIR)$(mandirsu)/sudo_plugin.$(mansectsu)
|
$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudo_plugin.$(mantype) $(DESTDIR)$(mandirsu)/sudo_plugin.$(mansectsu)
|
||||||
$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu)
|
$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu)
|
||||||
$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
|
$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
|
||||||
$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
|
$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
|
||||||
@LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
|
@LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
|
||||||
@MAN_POSTINSTALL@
|
@if test -n "$(MANCOMPRESS)"; then \
|
||||||
|
for f in $(mandirsu)/sudo.$(mansectsu) $(mandirsu)/sudo_plugin.$(mansectsu) $(mandirsu)/sudoreplay.$(mansectsu) $(mandirsu)/visudo.$(mansectsu) $(mandirform)/sudoers.$(mansectform) $(mandirform)/sudoers.ldap.$(mansectform); do \
|
||||||
|
if test -f $(DESTDIR)$$f; then \
|
||||||
|
echo $(MANCOMPRESS) -f $(DESTDIR)$$f; \
|
||||||
|
$(MANCOMPRESS) -f $(DESTDIR)$$f; \
|
||||||
|
fi; \
|
||||||
|
done; \
|
||||||
|
rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \
|
||||||
|
ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)$(MANCOMPRESSEXT) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)$(MANCOMPRESSEXT); \
|
||||||
|
else \
|
||||||
|
rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \
|
||||||
|
ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu); \
|
||||||
|
fi
|
||||||
|
|
||||||
install-plugin:
|
install-plugin:
|
||||||
|
|
||||||
|
3
mkpkg
3
mkpkg
@@ -185,6 +185,9 @@ case "$osversion" in
|
|||||||
;;
|
;;
|
||||||
deb*|ubu*)
|
deb*|ubu*)
|
||||||
prefix=/usr
|
prefix=/usr
|
||||||
|
# Man pages should be compressed in .deb files
|
||||||
|
export MANCOMPRESS='gzip -9'
|
||||||
|
export MANCOMPRESSEXT='.gz'
|
||||||
# If Ubuntu, add --enable-admin-flag
|
# If Ubuntu, add --enable-admin-flag
|
||||||
case "$osversion" in
|
case "$osversion" in
|
||||||
ubu*)
|
ubu*)
|
||||||
|
Reference in New Issue
Block a user