* Remove man-db tag for encoding for canonical man

This commit is contained in:
Werner Fink 2011-04-27 13:41:04 +00:00
parent 4301a57e89
commit bfca7da0f5
3 changed files with 15 additions and 6 deletions

View File

@ -1,6 +1,7 @@
sysvinit (2.89dsf) UNRELEASED; urgency=low sysvinit (2.89dsf) UNRELEASED; urgency=low
[ Werner Fink ] [ Werner Fink ]
* Remove man-db tag for encoding for canonical man
* Sulogin: try to detect the real device(s) used for the system console * Sulogin: try to detect the real device(s) used for the system console
/dev/console if but only if /dev/console is used. On Linux this can /dev/console if but only if /dev/console is used. On Linux this can
be more than one device, e.g. a serial line as well as a virtual be more than one device, e.g. a serial line as well as a virtual

View File

@ -1,3 +1,4 @@
'\" -*- coding: UTF-8 -*-
.\" A man page for fstab-decode(8). .\" A man page for fstab-decode(8).
.\" .\"
.\" Copyright (C) 2006 Red Hat, Inc. All rights reserved. .\" Copyright (C) 2006 Red Hat, Inc. All rights reserved.

View File

@ -12,6 +12,7 @@ CPPFLAGS =
CFLAGS ?= -ansi -O2 -fomit-frame-pointer CFLAGS ?= -ansi -O2 -fomit-frame-pointer
override CFLAGS += -W -Wall -D_GNU_SOURCE override CFLAGS += -W -Wall -D_GNU_SOURCE
STATIC = STATIC =
MANDB := s@^\('\\\\\"\)[^\*-]*-\*- coding: [^[:blank:]]\+ -\*-@\1@
# For some known distributions we do not build all programs, otherwise we do. # For some known distributions we do not build all programs, otherwise we do.
BIN = BIN =
@ -37,11 +38,13 @@ BIN += mountpoint
SBIN += sulogin bootlogd SBIN += sulogin bootlogd
MAN1 += mountpoint.1 MAN1 += mountpoint.1
MAN8 += sulogin.8 bootlogd.8 MAN8 += sulogin.8 bootlogd.8
MANDB :=
endif endif
ifeq ($(DISTRO),Owl) ifeq ($(DISTRO),Owl)
USRBIN += wall USRBIN += wall
MAN1 += wall.1 MAN1 += wall.1
MANDB :=
endif endif
ifeq ($(DISTRO),SuSE) ifeq ($(DISTRO),SuSE)
@ -51,6 +54,7 @@ SBIN += sulogin
USRBIN += utmpdump USRBIN += utmpdump
MAN1 += utmpdump.1 mountpoint.1 MAN1 += utmpdump.1 mountpoint.1
MAN8 += sulogin.8 MAN8 += sulogin.8
MANDB :=
endif endif
ID = $(shell id -u) ID = $(shell id -u)
@ -173,14 +177,17 @@ install:
$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
$(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/
$(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/
for i in $(MAN1); do \ for man in $(MAN1); do \
$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \ $(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man1/; \
sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man1/$$man ; \
done done
for i in $(MAN5); do \ for man in $(MAN5); do \
$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man5/; \ $(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man5/; \
sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man5/$$man ; \
done done
for i in $(MAN8); do \ for man in $(MAN8); do \
$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man8/; \ $(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man8/; \
sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man8/$$man ; \
done done
ifeq ($(ROOT),) ifeq ($(ROOT),)
# #