build-sys: Rearrange the manual pages

All man pages are found in ./man
man-po -> po-man

References:
 https://www.freelists.org/post/procps/Next-for-newlib,3

Signed-off-by: Craig Small <csmall@dropbear.xyz>

Documentation/translations.md

@@ -2,9 +2,9 @@ Translations
 ============
 
 There is a three-step process for translating man pages. Most
-of the work happens in the man-po directory.
+of the work happens in the po-man directory.
 
-> make -C man-po translate-templates
+> make -C po-man translate-templates
 Creates the translation templates (the .pot files) for translators
 to use as a base. These, along with the tar file, should be sent
 to the tp-coorindator before release.
@@ -13,9 +13,9 @@ to the tp-coorindator before release.
 rsyncs the latest translated (.po) files for both the programs and
 man pages.
 
-> make -C man-po translate-mans
+> make -C po-man translate-mans
 This is also called in the dist-hook and is where the translation
 magic happens. Take the original man page, the relevant .po file
 and produce a translated man page in that language.
 All of the man pages generated are found in
-man-po/(LANG)/man(SECTION)/
+po-man/(LANG)/man(SECTION)/

Makefile.am

@@ -20,7 +20,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = \
 	include \
-	man-po \
+	po-man \
 	po \
 	testsuite
 
@@ -70,26 +70,26 @@ lib_LTLIBRARIES = \
 	proc/libproc-2.la
 
 dist_man_MANS = \
-	free.1 \
+	man/free.1 \
-	pgrep.1 \
+	man/pgrep.1 \
-	pkill.1 \
+	man/pkill.1 \
-	pmap.1 \
+	man/pmap.1 \
-	uptime.1 \
+	man/uptime.1 \
-	vmstat.8 \
+	man/vmstat.8 \
-	doc/procps.3 \
+	man/procps.3 \
-	doc/procps_pids.3 \
+	man/procps_pids.3 \
-	doc/procps_misc.3
+	man/procps_misc.3
 
 if !CYGWIN
 dist_man_MANS += \
-	pwdx.1 \
+	man/pwdx.1 \
-	tload.1 \
+	man/tload.1 \
-	sysctl.8 \
+	man/sysctl.8 \
-	sysctl.conf.5 \
+	man/sysctl.conf.5 \
-	ps/ps.1
+	man/ps.1
 
 if BUILD_PIDWAIT
-dist_man_MANS += pidwait.1
+dist_man_MANS += man/pidwait.1
 endif
 endif
 
@@ -121,10 +121,10 @@ bin_PROGRAMS += pidof
 else
 usrbin_exec_PROGRAMS += pidof
 endif
-dist_man_MANS += pidof.1
+dist_man_MANS += man/pidof.1
-pidof_SOURCES = pidof.c lib/fileutils.c
+pidof_SOURCES = man/pidof.c lib/fileutils.c
 else
-  EXTRA_DIST += pidof.1
+  EXTRA_DIST += man/pidof.1
 endif
 
 if BUILD_KILL
@@ -134,11 +134,11 @@ usrbin_exec_PROGRAMS += kill
 else
 bin_PROGRAMS += kill
 endif
-dist_man_MANS += kill.1
+dist_man_MANS += man/kill.1
 kill_SOURCES = kill.c lib/strutils.c lib/fileutils.c lib/signals.c
 kill_LDADD =
 else
-  EXTRA_DIST += kill.1
+  EXTRA_DIST += man/kill.1
 endif
 
 if BUILD_W
@@ -148,10 +148,10 @@ else
 bin_PROGRAMS += w
 endif
 
-dist_man_MANS += w.1
+dist_man_MANS += man/w.1
 w_SOURCES = w.c lib/fileutils.c
 else
-  EXTRA_DIST += w.1
+  EXTRA_DIST += man/w.1
 endif
 
 if WITH_NCURSES
@@ -166,13 +166,13 @@ usrbin_exec_PROGRAMS += \
 endif
 
 dist_man_MANS += \
-	watch.1 \
+	man/watch.1 \
-	top/top.1
+	man/top.1
 if !CYGWIN
 bin_PROGRAMS += \
 	slabtop
 dist_man_MANS += \
-	slabtop.1
+	man/slabtop.1
 slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
 slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
 endif
@@ -205,12 +205,12 @@ endif
 skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/signals.c
 snice_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/signals.c
 dist_man_MANS += \
-	skill.1 \
+	man/skill.1 \
-	snice.1
+	man/snice.1
 else
   EXTRA_DIST += \
-	skill.1 \
+	man/skill.1 \
-	snice.1
+	man/snice.1
 endif
 
 free_SOURCES = free.c lib/strutils.c lib/fileutils.c
@@ -410,4 +410,4 @@ dist-hook:
 get-trans:
 	echo "Getting the latest translations from translationproject.org..."
 	rsync -Lrtvz  translationproject.org::tp/latest/procps-ng/  po
-	rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man/  man-po
+	rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man/  po-man

configure.ac

@@ -393,7 +393,7 @@ AC_CHECK_FUNCS([__fpending alarm atexit dup2 gethostname getpagesize gettimeofda
 
 AC_CONFIG_FILES([Makefile
                  include/Makefile
-                 man-po/Makefile
+                 po-man/Makefile
                  po/Makefile.in
                  proc/libproc-2.pc
                  testsuite/Makefile])

create-man-pot.sh

@@ -5,13 +5,13 @@
 SRCDIR=$(dirname ${0})
 test -z "${SRCDIR}" && SRCDIR=.
 
-if [ -d man-po ] ; then
+if [ -d po-man ] ; then
-  echo "man-po: directory exists, will be reused"
+  echo "po-man: directory exists, will be reused"
   else
-    mkdir -p man-po
+    mkdir -p po-man
 fi
 
-PO_FILES="man-po/*.po"
+PO_FILES="po-man/*.po"
 
 po4a-updatepo -f man -m ${SRCDIR}/free.1 \
                      -m ${SRCDIR}/kill.1 \
@@ -30,13 +30,13 @@ po4a-updatepo -f man -m ${SRCDIR}/free.1 \
                      -m ${SRCDIR}/vmstat.8 \
                      -m ${SRCDIR}/w.1 \
                      -m ${SRCDIR}/watch.1 \
-                     -p man-po/template-man.pot ${PO_FILES}
+                     -p po-man/template-man.pot ${PO_FILES}
 
 po4a-updatepo -f man -m ${SRCDIR}/ps/ps.1 \
-                     -p man-po/template-man-ps.pot
+                     -p po-man/template-man-ps.pot
 
 po4a-updatepo -f man -m ${SRCDIR}/top/top.1 \
-                     -p man-po/template-man-top.pot
+                     -p po-man/template-man-top.pot
 
 # Rename the file according to the version of your (pre-release) tarball.
 # Send the new file together with a link to the tarball to the TP coordinators:

po-man/Makefile.am

@@ -3,21 +3,21 @@
 # translated/* are put in distribution but not found in VCS
 #
 # run:
-#   rm man-po/man.stamp
+#   rm po-man/man.stamp
-#   make -C man-po man.stamp
+#   make -C po-man man.stamp
 # To update man page translations
 
 # Not sure why this needs to be repeated from the top-level Makefile but it does
 dist_man_MANS = \
-	../free.1 \
+	../man/free.1 \
-	../pgrep.1 \
+	../man/pgrep.1 \
-	../pkill.1 \
+	../man/pkill.1 \
-	../pmap.1 \
+	../man/pmap.1 \
-	../uptime.1 \
+	../man/uptime.1 \
-	../vmstat.8 \
+	../man/vmstat.8 \
-	../doc/procps.3 \
+	../man/procps.3 \
-	../doc/procps_pids.3 \
+	../man/procps_pids.3 \
-	../doc/procps_misc.3
+	../man/procps_misc.3
 
 translated_MANS = $(wildcard translated/*/*.[1-9])
 translated_MAN_sections=$(subst .,,$(sort $(suffix $(translated_MANS))))

po-man/po4a.cfg

@@ -3,62 +3,62 @@
 [po4a_langs] de fr pl pt_BR sv uk zh_CN
 [po4a_paths] procps-man.pot $lang:$lang.po
 
-[type: man] ../free.1 $lang:$lang/free.1 \
+[type: man] ../man/free.1 $lang:$lang/free.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../kill.1 $lang:$lang/kill.1 \
+[type: man] ../man/kill.1 $lang:$lang/kill.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../pgrep.1 $lang:$lang/pgrep.1 \
+[type: man] ../man/pgrep.1 $lang:$lang/pgrep.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../pidof.1 $lang:$lang/pidof.1 \
+[type: man] ../man/pidof.1 $lang:$lang/pidof.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../pmap.1 $lang:$lang/pmap.1 \
+[type: man] ../man/pmap.1 $lang:$lang/pmap.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../pwdx.1 $lang:$lang/pwdx.1 \
+[type: man] ../man/pwdx.1 $lang:$lang/pwdx.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../skill.1 $lang:$lang/skill.1 \
+[type: man] ../man/skill.1 $lang:$lang/skill.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../slabtop.1 $lang:$lang/slabtop.1 \
+[type: man] ../man/slabtop.1 $lang:$lang/slabtop.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../sysctl.8 $lang:$lang/sysctl.8 \
+[type: man] ../man/sysctl.8 $lang:$lang/sysctl.8 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../sysctl.conf.5 $lang:$lang/sysctl.conf.5 \
+[type: man] ../man/sysctl.conf.5 $lang:$lang/sysctl.conf.5 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../tload.1 $lang:$lang/tload.1 \
+[type: man] ../man/tload.1 $lang:$lang/tload.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../uptime.1 $lang:$lang/uptime.1 \
+[type: man] ../man/uptime.1 $lang:$lang/uptime.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../vmstat.8 $lang:$lang/vmstat.8 \
+[type: man] ../man/vmstat.8 $lang:$lang/vmstat.8 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../w.1 $lang:$lang/w.1 \
+[type: man] ../man/w.1 $lang:$lang/w.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../watch.1 $lang:$lang/watch.1 \
+[type: man] ../man/watch.1 $lang:$lang/watch.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../ps/ps.1 $lang:$lang/ps.1 \
+[type: man] ../man/ps.1 $lang:$lang/ps.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../top/top.1 $lang:$lang/top.1 \
+[type: man] ../man/top.1 $lang:$lang/top.1 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../doc/procps.3 $lang:$lang/procps.3 \
+[type: man] ../man/procps.3 $lang:$lang/procps.3 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../doc/procps_misc.3 $lang:$lang/procps_misc.3 \
+[type: man] ../man/procps_misc.3 $lang:$lang/procps_misc.3 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"
 
-[type: man] ../doc/procps_pids.3 $lang:$lang/procps_pids.3 \
+[type: man] ../man/procps_pids.3 $lang:$lang/procps_pids.3 \
             add_$lang:?add_$lang/$lang.add opt:"-k 80"

translate-man.sh

@@ -4,17 +4,17 @@
 #
 # Once the TP module has been created, this commands get the latest po files:
 # echo "Getting the latest translations from translationproject.org..."
-# rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man/  man-po
+# rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man/  po-man
-# rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man-ps/  man-po/ps
+# rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man-ps/  po-man/ps
-# rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man-top/  man-po/top
+# rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man-top/  po-man/top
 
-if [ -d man-po ] ; then
+if [ -d po-man ] ; then
-  echo "man-po: directory exists, will be reused"
+  echo "po-man: directory exists, will be reused"
   else
-    mkdir -p man-po/{ps,top}
+    mkdir -p po-man/{ps,top}
 fi
 
-cd man-po
+cd po-man
 
 langfiles=*.po
 if [ $langfiles = '*.po' ] ; then