STABLE14-man-page-reorg-20051209

Generate the man pages in man1, man5, and man8 subdirectories rather than
directly in the doc/man-pages directory to reduce clutter.  Add a
.cvsignore to reduce noise.

(cherry picked from commit 7b5bfb1c1793c488fff06fc9014119a286ec86a7)

diff --git a/doc/man-pages/.cvsignore b/doc/man-pages/.cvsignore
new file mode 100644 (file)
index 0000000..70c1421
--- /dev/null
+++ b/doc/man-pages/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+man1
+man5
+man8

diff --git a/doc/man-pages/Makefile.in b/doc/man-pages/Makefile.in
index 9ec2d9b507407fee29a05be41d9f51fdbae351c5..a4d6b78e82585fcfeab53677c909375c67f10849 100644 (file)
--- a/doc/man-pages/Makefile.in
+++ b/doc/man-pages/Makefile.in
@@ -6,29 +6,29 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 all:
 
 maintclean:
-       rm -f *.1 *.5 *.8
+       rm -rf man1 man5 man8
 
 dest:
        mkdir -p $(DEST)/man/man1 $(DEST)/man/man5 $(DEST)/man/man8
-       set -e; for M in *.1 ; do \
+       set -e; cd man1 && for M in *.1 ; do \
            $(INSTALL) -c -m 0644 $$M $(DEST)/man/man1/$$M ; \
        done
-       set -e; for M in *.5 ; do \
+       set -e; cd man5 && for M in *.5 ; do \
            $(INSTALL) -c -m 0644 $$M $(DEST)/man/man5/$$M ; \
        done
-       set -e; for M in *.8 ; do \
+       set -e; cd man8 && for M in *.8 ; do \
            $(INSTALL) -c -m 0644 $$M $(DEST)/man/man8/$$M ; \
        done
 
 install: $(MAN1) $(MAN8)
        mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 \
            $(DESTDIR)$(mandir)/man8
-       set -e; for M in *.1 ; do \
+       set -e; cd man1 && for M in *.1 ; do \
            $(INSTALL) -c -m 0644 $$M $(DESTDIR)$(mandir)/man1/$$M ; \
        done
-       set -e; for M in *.5 ; do \
+       set -e; cd man5 && for M in *.5 ; do \
            $(INSTALL) -c -m 0644 $$M $(DESTDIR)$(mandir)/man5/$$M ; \
        done
-       set -e; for M in *.8 ; do \
+       set -e; cd man8 && for M in *.8 ; do \
            $(INSTALL) -c -m 0644 $$M $(DESTDIR)$(mandir)/man8/$$M ; \
        done

diff --git a/regen.sh b/regen.sh
index c6deaf8e024c8454b68d63fad818eaf8a17db400..f232c6c83e1c6fa40433df44d95490966d51d708 100755 (executable)
--- a/regen.sh
+++ b/regen.sh
@@ -15,19 +15,20 @@ autoheader
 # pod2man available.
 echo "Building man pages"
 if test -d doc ; then
+    mkdir -p doc/man-pages/man1 doc/man-pages/man5 doc/man-pages/man8
     for f in doc/man-pages/pod1/*.pod ; do
         pod2man -c 'AFS Command Reference' -r 'OpenAFS' -s 1 \
             -n `basename "$f" | sed 's/\.pod$//'` "$f" \
-            > `echo "$f" | sed -e 's%pod1/%%' -e 's/\.pod$/.1/'`
+            > `echo "$f" | sed -e 's%pod1/%man1/%' -e 's/\.pod$/.1/'`
     done
     for f in doc/man-pages/pod5/*.pod ; do
         pod2man -c 'AFS File Reference' -r 'OpenAFS' -s 5 \
             -n `basename "$f" | sed 's/\.pod$//'` "$f" \
-            > `echo "$f" | sed -e 's%pod5/%%' -e 's/\.pod$/.5/'`
+            > `echo "$f" | sed -e 's%pod5/%man5/%' -e 's/\.pod$/.5/'`
     done
     for f in doc/man-pages/pod8/*.pod ; do
         pod2man -c 'AFS Command Reference' -r 'OpenAFS' -s 8 \
             -n `basename "$f" | sed 's/\.pod$//'` "$f" \
-            > `echo "$f" | sed -e 's%pod8/%%' -e 's/\.pod$/.8/'`
+            > `echo "$f" | sed -e 's%pod8/%man8/%' -e 's/\.pod$/.8/'`
     done
 fi