* 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.

diff --git a/ChangeLog b/ChangeLog
index 269917905020bf96d22024aa72d7d12c3382617c..081062218decaaf265415749f7712aa27701f99a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/NEWS b/NEWS
index 28fb2eb36303fa69503ebff98f16e529df613468..a4c2ce3ea5cf6bdb6250f1e450c631360ba709f2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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.

diff --git a/man/Makefile.am b/man/Makefile.am
index 7eef21744ea771f50d9820eb5287fdc95d58ce04..7e013a01558795470dd640757ea848db27e904f6 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -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
 

diff --git a/man/da/Makefile.am b/man/da/Makefile.am
index 28a08ba139529170a2f484aa79bcb7f05ed636eb..a3b09224e9128a5f7b76cb342873e9770240d653 100644 (file)
--- a/man/da/Makefile.am
+++ b/man/da/Makefile.am
@@ -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)

diff --git a/man/de/Makefile.am b/man/de/Makefile.am
index 6e94ab1d7b86092ae2e00546c79bd6e0e8c8f729..3cd302ee7a8d241b7b2c3b11363eed697757a0b2 100644 (file)
--- a/man/de/Makefile.am
+++ b/man/de/Makefile.am
@@ -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)

diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am
index fdcb8d3395b890d330aa2e046e14bdffe8a52b96..c6800dc0c38abd5e07a7b82fc72ee15e0f0eaafb 100644 (file)
--- a/man/fr/Makefile.am
+++ b/man/fr/Makefile.am
@@ -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)

diff --git a/man/generate_mans.mak b/man/generate_mans.mak
index 20268d7f72ac6eb133b580e87b59869ed9172575..a44180462891bb60d9a02820e2dd2f23127ded48 100644 (file)
--- a/man/generate_mans.mak
+++ b/man/generate_mans.mak
@@ -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

diff --git a/man/it/Makefile.am b/man/it/Makefile.am
index 265dbc82e5bb2562d742abf80409d821cb115098..94460aac599e64b90a437cbb7504b489de7d2018 100644 (file)
--- a/man/it/Makefile.am
+++ b/man/it/Makefile.am
@@ -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)

diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am
index c18082be0ccc7b09920c9d423bfdaf4bc0689a5d..724d25f399a7fc9ac1f9e6341355314030c2a052 100644 (file)
--- a/man/pl/Makefile.am
+++ b/man/pl/Makefile.am
@@ -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)

diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am
index 26429a0093b9f4bb047a7f4afafe8939eb197e5d..8a776a87a57def48edb26fcaa4d84e16503eee02 100644 (file)
--- a/man/ru/Makefile.am
+++ b/man/ru/Makefile.am
@@ -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)

diff --git a/man/sv/Makefile.am b/man/sv/Makefile.am
index c3928c550432a80c99508f87b9ee8fbbd5938046..e64b7bc8166b23c448506a61e30e14a5db60e04b 100644 (file)
--- a/man/sv/Makefile.am
+++ b/man/sv/Makefile.am
@@ -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)

diff --git a/man/zh_CN/Makefile.am b/man/zh_CN/Makefile.am
index 8c82802348554e988fe7512675dde76c6245365e..e9d8f2c2b787e7f24199d818f26850245ef48bba 100644 (file)
--- a/man/zh_CN/Makefile.am
+++ b/man/zh_CN/Makefile.am
@@ -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)