* NEWS, man/generate_mans.mak: Generate manpages in man1, man3,

man5, man8 subdirectories. This fix the generation of .so links
	which did not point to a path relative to the top-level manual
	hierarchy.
	* man/generate_mans.mak: Update man paths accordingly.
	* man/Makefile.am: Likewise.
	* man/da/Makefile.am: Likewise.
	* man/de/Makefile.am: Likewise.
	* man/fr/Makefile.am: Likewise.
	* man/it/Makefile.am: Likewise.
	* man/pl/Makefile.am: Likewise.
	* man/ru/Makefile.am: Likewise.
	* man/sv/Makefile.am: Likewise.
	* man/zh_CN/Makefile.am: Likewise.
This commit is contained in:
nekral-guest 2012-05-20 10:18:33 +00:00
parent d755279fad
commit 788374bd8c
12 changed files with 366 additions and 344 deletions

View File

@ -1,3 +1,20 @@
2012-05-20 Nicolas François <nicolas.francois@centraliens.net>
* NEWS, man/generate_mans.mak: Generate manpages in man1, man3,
man5, man8 subdirectories. This fix the generation of .so links
which did not point to a path relative to the top-level manual
hierarchy.
* man/generate_mans.mak: Update man paths accordingly.
* man/Makefile.am: Likewise.
* man/da/Makefile.am: Likewise.
* man/de/Makefile.am: Likewise.
* man/fr/Makefile.am: Likewise.
* man/it/Makefile.am: Likewise.
* man/pl/Makefile.am: Likewise.
* man/ru/Makefile.am: Likewise.
* man/sv/Makefile.am: Likewise.
* man/zh_CN/Makefile.am: Likewise.
2012-05-20 Nicolas François <nicolas.francois@centraliens.net>
* configure.in: Prepare for next point release 4.1.5.1.

3
NEWS
View File

@ -8,6 +8,9 @@ shadow-4.1.5 -> shadow-4.1.5.1 UNRELEASED
- userdel
* Fix segfault when userdel removes the user's group.
*** documentation
* .so links now point to paths relative to the top-level manual hierarchy
*** translation
* Updated French man pages translation.
* Updated German man pages translation.

View File

@ -7,52 +7,52 @@ SUBDIRS =
endif
man_MANS = \
chage.1 \
chfn.1 \
chgpasswd.8 \
chpasswd.8 \
chsh.1 \
expiry.1 \
faillog.5 \
faillog.8 \
getspnam.3 \
gpasswd.1 \
groupadd.8 \
groupdel.8 \
groupmems.8 \
groupmod.8 \
groups.1 \
grpck.8 \
grpconv.8 \
grpunconv.8 \
gshadow.5 \
lastlog.8 \
login.1 \
login.defs.5 \
logoutd.8 \
newgrp.1 \
newusers.8 \
nologin.8 \
passwd.1 \
passwd.5 \
pwck.8 \
pwconv.8 \
pwunconv.8 \
sg.1 \
shadow.3 \
shadow.5 \
su.1 \
suauth.5 \
useradd.8 \
userdel.8 \
usermod.8 \
vigr.8 \
vipw.8
man1/chage.1 \
man1/chfn.1 \
man8/chgpasswd.8 \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
man5/faillog.5 \
man8/faillog.8 \
man3/getspnam.3 \
man1/gpasswd.1 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
man8/groupmod.8 \
man1/groups.1 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man1/login.1 \
man5/login.defs.5 \
man8/logoutd.8 \
man1/newgrp.1 \
man8/newusers.8 \
man8/nologin.8 \
man1/passwd.1 \
man5/passwd.5 \
man8/pwck.8 \
man8/pwconv.8 \
man8/pwunconv.8 \
man1/sg.1 \
man3/shadow.3 \
man5/shadow.5 \
man1/su.1 \
man5/suauth.5 \
man8/useradd.8 \
man8/userdel.8 \
man8/usermod.8 \
man8/vigr.8 \
man8/vipw.8
man_nopam = \
limits.5 \
login.access.5 \
porttime.5
man5/limits.5 \
man5/login.access.5 \
man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@ -166,9 +166,9 @@ EXTRA_DIST = \
$(man_MANS) \
$(man_XMANS) \
$(addprefix login.defs.d/,$(login_defs_v)) \
id.1 \
man1/id.1 \
id.1.xml \
sulogin.8 \
man8/sulogin.8 \
sulogin.8.xml \
generate_mans.mak \
generate_translations.mak
@ -179,7 +179,7 @@ endif
generate_mans.deps: *.xml
echo "# This file is generated" > $@
awk 'BEGIN{FS="\"";} /^<!ENTITY .* * SYSTEM ".*">$$/{ f=FILENAME; sub(/.xml/,"",f); print f ": " $$2 }' $(man_XMANS) >> $@
awk 'BEGIN{FS="\"";} /^<!ENTITY .* * SYSTEM ".*">$$/{ f=FILENAME; sub(/.xml/,"",f); print "man" substr(f, length (f)) "/" f ": " $$2 }' $(man_XMANS) >> $@
if ENABLE_REGENERATE_MAN

View File

@ -3,16 +3,16 @@ mandir = @mandir@/da
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = \
chfn.1 \
groupdel.8 \
groups.1 \
gshadow.5 \
logoutd.8 \
newgrp.1 \
nologin.8 \
sg.1 \
vigr.8 \
vipw.8
man1/chfn.1 \
man8/groupdel.8 \
man1/groups.1 \
man5/gshadow.5 \
man8/logoutd.8 \
man1/newgrp.1 \
man8/nologin.8 \
man1/sg.1 \
man8/vigr.8 \
man8/vipw.8
man_nopam =
@ -22,7 +22,7 @@ endif
EXTRA_DIST = \
$(man_MANS) \
id.1
man1/id.1
if USE_PAM
EXTRA_DIST += $(man_nopam)

View File

@ -2,52 +2,52 @@
mandir = @mandir@/de
man_MANS = \
chage.1 \
chfn.1 \
chgpasswd.8 \
chpasswd.8 \
chsh.1 \
expiry.1 \
faillog.5 \
faillog.8 \
getspnam.3 \
gpasswd.1 \
groupadd.8 \
groupdel.8 \
groupmems.8 \
groupmod.8 \
groups.1 \
grpck.8 \
grpconv.8 \
grpunconv.8 \
gshadow.5 \
lastlog.8 \
login.1 \
login.defs.5 \
logoutd.8 \
newgrp.1 \
newusers.8 \
nologin.8 \
passwd.1 \
passwd.5 \
pwck.8 \
pwconv.8 \
pwunconv.8 \
sg.1 \
shadow.3 \
shadow.5 \
su.1 \
suauth.5 \
useradd.8 \
userdel.8 \
usermod.8 \
vigr.8 \
vipw.8
man1/chage.1 \
man1/chfn.1 \
man8/chgpasswd.8 \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
man5/faillog.5 \
man8/faillog.8 \
man3/getspnam.3 \
man1/gpasswd.1 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
man8/groupmod.8 \
man1/groups.1 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man1/login.1 \
man5/login.defs.5 \
man8/logoutd.8 \
man1/newgrp.1 \
man8/newusers.8 \
man8/nologin.8 \
man1/passwd.1 \
man5/passwd.5 \
man8/pwck.8 \
man8/pwconv.8 \
man8/pwunconv.8 \
man1/sg.1 \
man3/shadow.3 \
man5/shadow.5 \
man1/su.1 \
man5/suauth.5 \
man8/useradd.8 \
man8/userdel.8 \
man8/usermod.8 \
man8/vigr.8 \
man8/vipw.8
man_nopam = \
limits.5 \
login.access.5 \
porttime.5
man5/limits.5 \
man5/login.access.5 \
man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@ -55,8 +55,8 @@ endif
EXTRA_DIST = \
$(man_MANS) \
id.1 \
sulogin.8
man1/id.1 \
man8/sulogin.8
if USE_PAM
EXTRA_DIST += $(man_nopam)

View File

@ -2,52 +2,52 @@
mandir = @mandir@/fr
man_MANS = \
chage.1 \
chfn.1 \
chgpasswd.8 \
chpasswd.8 \
chsh.1 \
expiry.1 \
faillog.5 \
faillog.8 \
getspnam.3 \
gpasswd.1 \
groupadd.8 \
groupdel.8 \
groupmems.8 \
groupmod.8 \
groups.1 \
grpck.8 \
grpconv.8 \
grpunconv.8 \
gshadow.5 \
lastlog.8 \
login.1 \
login.defs.5 \
logoutd.8 \
newgrp.1 \
newusers.8 \
nologin.8 \
passwd.1 \
passwd.5 \
pwck.8 \
pwconv.8 \
pwunconv.8 \
sg.1 \
shadow.3 \
shadow.5 \
su.1 \
suauth.5 \
useradd.8 \
userdel.8 \
usermod.8 \
vigr.8 \
vipw.8
man1/chage.1 \
man1/chfn.1 \
man8/chgpasswd.8 \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
man5/faillog.5 \
man8/faillog.8 \
man3/getspnam.3 \
man1/gpasswd.1 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
man8/groupmod.8 \
man1/groups.1 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man1/login.1 \
man5/login.defs.5 \
man8/logoutd.8 \
man1/newgrp.1 \
man8/newusers.8 \
man8/nologin.8 \
man1/passwd.1 \
man5/passwd.5 \
man8/pwck.8 \
man8/pwconv.8 \
man8/pwunconv.8 \
man1/sg.1 \
man3/shadow.3 \
man5/shadow.5 \
man1/su.1 \
man5/suauth.5 \
man8/useradd.8 \
man8/userdel.8 \
man8/usermod.8 \
man8/vigr.8 \
man8/vipw.8
man_nopam = \
limits.5 \
login.access.5 \
porttime.5
man5/limits.5 \
man5/login.access.5 \
man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@ -55,8 +55,8 @@ endif
EXTRA_DIST = \
$(man_MANS) \
id.1 \
sulogin.8
man1/id.1 \
man8/sulogin.8
if USE_PAM
EXTRA_DIST += $(man_nopam)

View File

@ -28,8 +28,10 @@ if ENABLE_REGENERATE_MAN
sed -e 's/^\(<!DOCTYPE .*docbookx.dtd"\)>/\1 [<!ENTITY % config SYSTEM "config.xml">%config;]>/' $< > $@; \
fi
%: %.xml-config Makefile config.xml
man1/% man3/% man5/% man8/%: %.xml-config Makefile config.xml
$(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(TCB_COND);$(SHA_CRYPT_COND)" \
--stringparam "man.output.base.dir" "" \
--param "man.output.in.separate.dir" "1" \
-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $<
else
$(man_MANS):
@ -37,8 +39,8 @@ $(man_MANS):
@false
endif
grpconv.8 grpunconv.8 pwunconv.8: pwconv.8
man8/grpconv.8 man8/grpunconv.8 man8/pwunconv.8: man8/pwconv.8
getspnam.3: shadow.3
man3/getspnam.3: man3/shadow.3
vigr.8: vipw.8
man8/vigr.8: man8/vipw.8

View File

@ -2,52 +2,52 @@
mandir = @mandir@/it
man_MANS = \
chage.1 \
chfn.1 \
chgpasswd.8 \
chpasswd.8 \
chsh.1 \
expiry.1 \
faillog.5 \
faillog.8 \
getspnam.3 \
gpasswd.1 \
groupadd.8 \
groupdel.8 \
groupmems.8 \
groupmod.8 \
groups.1 \
grpck.8 \
grpconv.8 \
grpunconv.8 \
gshadow.5 \
lastlog.8 \
login.1 \
login.defs.5 \
logoutd.8 \
newgrp.1 \
newusers.8 \
nologin.8 \
passwd.1 \
passwd.5 \
pwck.8 \
pwconv.8 \
pwunconv.8 \
sg.1 \
shadow.3 \
shadow.5 \
su.1 \
suauth.5 \
useradd.8 \
userdel.8 \
usermod.8 \
vigr.8 \
vipw.8
man1/chage.1 \
man1/chfn.1 \
man8/chgpasswd.8 \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
man5/faillog.5 \
man8/faillog.8 \
man3/getspnam.3 \
man1/gpasswd.1 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
man8/groupmod.8 \
man1/groups.1 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man1/login.1 \
man5/login.defs.5 \
man8/logoutd.8 \
man1/newgrp.1 \
man8/newusers.8 \
man8/nologin.8 \
man1/passwd.1 \
man5/passwd.5 \
man8/pwck.8 \
man8/pwconv.8 \
man8/pwunconv.8 \
man1/sg.1 \
man3/shadow.3 \
man5/shadow.5 \
man1/su.1 \
man5/suauth.5 \
man8/useradd.8 \
man8/userdel.8 \
man8/usermod.8 \
man8/vigr.8 \
man8/vipw.8
man_nopam = \
limits.5 \
login.access.5 \
porttime.5
man5/limits.5 \
man5/login.access.5 \
man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@ -55,8 +55,8 @@ endif
EXTRA_DIST = \
$(man_MANS) \
id.1 \
sulogin.8
man1/id.1 \
man8/sulogin.8
if USE_PAM
EXTRA_DIST += $(man_nopam)

View File

@ -3,30 +3,30 @@ mandir = @mandir@/pl
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = \
chage.1 \
chsh.1 \
expiry.1 \
faillog.5 \
faillog.8 \
getspnam.3 \
groupadd.8 \
groupdel.8 \
groupmems.8 \
groupmod.8 \
groups.1 \
grpck.8 \
lastlog.8 \
logoutd.8 \
newgrp.1 \
sg.1 \
shadow.3 \
userdel.8 \
usermod.8 \
vigr.8 \
vipw.8
man1/chage.1 \
man1/chsh.1 \
man1/expiry.1 \
man5/faillog.5 \
man8/faillog.8 \
man3/getspnam.3 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
man8/groupmod.8 \
man1/groups.1 \
man8/grpck.8 \
man8/lastlog.8 \
man8/logoutd.8 \
man1/newgrp.1 \
man1/sg.1 \
man3/shadow.3 \
man8/userdel.8 \
man8/usermod.8 \
man8/vigr.8 \
man8/vipw.8
man_nopam = \
porttime.5
man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@ -34,7 +34,7 @@ endif
EXTRA_DIST = \
$(man_MANS) \
id.1
man1/id.1
if USE_PAM
EXTRA_DIST += $(man_nopam)

View File

@ -2,52 +2,52 @@
mandir = @mandir@/ru
man_MANS = \
chage.1 \
chfn.1 \
chgpasswd.8 \
chpasswd.8 \
chsh.1 \
expiry.1 \
faillog.5 \
faillog.8 \
getspnam.3 \
gpasswd.1 \
groupadd.8 \
groupdel.8 \
groupmems.8 \
groupmod.8 \
groups.1 \
grpck.8 \
grpconv.8 \
grpunconv.8 \
gshadow.5 \
lastlog.8 \
login.1 \
login.defs.5 \
logoutd.8 \
newgrp.1 \
newusers.8 \
nologin.8 \
passwd.1 \
passwd.5 \
pwck.8 \
pwconv.8 \
pwunconv.8 \
sg.1 \
shadow.3 \
shadow.5 \
su.1 \
suauth.5 \
useradd.8 \
userdel.8 \
usermod.8 \
vigr.8 \
vipw.8
man1/chage.1 \
man1/chfn.1 \
man8/chgpasswd.8 \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
man5/faillog.5 \
man8/faillog.8 \
man3/getspnam.3 \
man1/gpasswd.1 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
man8/groupmod.8 \
man1/groups.1 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man1/login.1 \
man5/login.defs.5 \
man8/logoutd.8 \
man1/newgrp.1 \
man8/newusers.8 \
man8/nologin.8 \
man1/passwd.1 \
man5/passwd.5 \
man8/pwck.8 \
man8/pwconv.8 \
man8/pwunconv.8 \
man1/sg.1 \
man3/shadow.3 \
man5/shadow.5 \
man1/su.1 \
man5/suauth.5 \
man8/useradd.8 \
man8/userdel.8 \
man8/usermod.8 \
man8/vigr.8 \
man8/vipw.8
man_nopam = \
limits.5 \
login.access.5 \
porttime.5
man5/limits.5 \
man5/login.access.5 \
man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@ -55,8 +55,8 @@ endif
EXTRA_DIST = \
$(man_MANS) \
id.1 \
sulogin.8
man1/id.1 \
man8/sulogin.8
if USE_PAM
EXTRA_DIST += $(man_nopam)

View File

@ -2,36 +2,36 @@ mandir = @mandir@/sv
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = \
chage.1 \
chsh.1 \
expiry.1 \
faillog.5 \
faillog.8 \
getspnam.3 \
groupadd.8 \
groupdel.8 \
groupmems.8 \
groupmod.8 \
groups.1 \
grpck.8 \
gshadow.5 \
lastlog.8 \
logoutd.8 \
newgrp.1 \
nologin.8 \
passwd.1 \
passwd.5 \
pwck.8 \
sg.1 \
shadow.3 \
suauth.5 \
userdel.8 \
vigr.8 \
vipw.8
man1/chage.1 \
man1/chsh.1 \
man1/expiry.1 \
man5/faillog.5 \
man8/faillog.8 \
man3/getspnam.3 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
man8/groupmod.8 \
man1/groups.1 \
man8/grpck.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man8/logoutd.8 \
man1/newgrp.1 \
man8/nologin.8 \
man1/passwd.1 \
man5/passwd.5 \
man8/pwck.8 \
man1/sg.1 \
man3/shadow.3 \
man5/suauth.5 \
man8/userdel.8 \
man8/vigr.8 \
man8/vipw.8
man_nopam = \
limits.5 \
porttime.5
man5/limits.5 \
man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@ -39,7 +39,7 @@ endif
EXTRA_DIST = \
$(man_MANS) \
id.1
man1/id.1
if USE_PAM
EXTRA_DIST += $(man_nopam)

View File

@ -2,52 +2,52 @@
mandir = @mandir@/zh_CN
man_MANS = \
chage.1 \
chfn.1 \
chgpasswd.8 \
chpasswd.8 \
chsh.1 \
expiry.1 \
faillog.5 \
faillog.8 \
getspnam.3 \
gpasswd.1 \
groupadd.8 \
groupdel.8 \
groupmems.8 \
groupmod.8 \
groups.1 \
grpck.8 \
grpconv.8 \
grpunconv.8 \
gshadow.5 \
lastlog.8 \
login.1 \
login.defs.5 \
logoutd.8 \
newgrp.1 \
newusers.8 \
nologin.8 \
passwd.1 \
passwd.5 \
pwck.8 \
pwconv.8 \
pwunconv.8 \
sg.1 \
shadow.3 \
shadow.5 \
su.1 \
suauth.5 \
useradd.8 \
userdel.8 \
usermod.8 \
vigr.8 \
vipw.8
man1/chage.1 \
man1/chfn.1 \
man8/chgpasswd.8 \
man8/chpasswd.8 \
man1/chsh.1 \
man1/expiry.1 \
man5/faillog.5 \
man8/faillog.8 \
man3/getspnam.3 \
man1/gpasswd.1 \
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmems.8 \
man8/groupmod.8 \
man1/groups.1 \
man8/grpck.8 \
man8/grpconv.8 \
man8/grpunconv.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man1/login.1 \
man5/login.defs.5 \
man8/logoutd.8 \
man1/newgrp.1 \
man8/newusers.8 \
man8/nologin.8 \
man1/passwd.1 \
man5/passwd.5 \
man8/pwck.8 \
man8/pwconv.8 \
man8/pwunconv.8 \
man1/sg.1 \
man3/shadow.3 \
man5/shadow.5 \
man1/su.1 \
man5/suauth.5 \
man8/useradd.8 \
man8/userdel.8 \
man8/usermod.8 \
man8/vigr.8 \
man8/vipw.8
man_nopam = \
limits.5 \
login.access.5 \
porttime.5
man5/limits.5 \
man5/login.access.5 \
man5/porttime.5
if !USE_PAM
man_MANS += $(man_nopam)
@ -55,8 +55,8 @@ endif
EXTRA_DIST = \
$(man_MANS) \
id.1 \
sulogin.8
man1/id.1 \
man8/sulogin.8
if USE_PAM
EXTRA_DIST += $(man_nopam)