Be a little more careful about identifying mdoc-format manpages.

In particular, I recently had the update script pick up and try
to convert libarchive.so.5. Ouch.

SVN-Revision: 1589

1 files changed, 35 insertions, 40 deletions

diff --git a/doc/update.sh b/doc/update.sh
index 060ea808..1427d70e 100755
--- a/doc/update.sh
+++ b/doc/update.sh
@@ -5,6 +5,11 @@
 # the mdoc man pages stored in each project.
 #
 
+# Collect list of man pages, relative to my subdirs
+cd man
+MANPAGES=`for d in libarchive tar cpio;do ls ../../$d/*.[135];done | grep -v '\.so\.'`
+cd ..
+
 # Build Makefile in 'man' directory
 cd man
 rm -f *.[135]
@@ -12,14 +17,12 @@ echo > Makefile
 echo "default: all" >>Makefile
 echo >>Makefile
 all="all:"
-for d in libarchive tar cpio; do
-    for f in ../../$d/*.[135]; do
-	outname="`basename $f`"
-	echo >> Makefile
-	echo $outname: ../mdoc2man.awk $f >> Makefile
-	echo "	awk -f ../mdoc2man.awk < $f > $outname" >> Makefile
-        all="$all $outname"
-    done
+for f in $MANPAGES; do
+    outname="`basename $f`"
+    echo >> Makefile
+    echo $outname: ../mdoc2man.awk $f >> Makefile
+    echo "	awk -f ../mdoc2man.awk < $f > $outname" >> Makefile
+    all="$all $outname"
 done
 echo $all >>Makefile
 cd ..
@@ -31,14 +34,12 @@ echo > Makefile
 echo "default: all" >>Makefile
 echo >>Makefile
 all="all:"
-for d in libarchive tar cpio; do
-    for f in ../../$d/*.[135]; do
-	outname="`basename $f`.txt"
-	echo >> Makefile
-	echo $outname: $f >> Makefile
-	echo "	nroff -mdoc $f | col -b > $outname" >> Makefile
-        all="$all $outname"
-    done
+for f in $MANPAGES; do
+    outname="`basename $f`.txt"
+    echo >> Makefile
+    echo $outname: $f >> Makefile
+    echo "	nroff -mdoc $f | col -b > $outname" >> Makefile
+    all="$all $outname"
 done
 echo $all >>Makefile
 cd ..
@@ -50,14 +51,12 @@ echo > Makefile
 echo "default: all" >>Makefile
 echo >>Makefile
 all="all:"
-for d in libarchive tar cpio; do
-    for f in ../../$d/*.[135]; do
-	outname="`basename $f`.pdf"
-	echo >> Makefile
-	echo $outname: $f >> Makefile
-	echo "	groff -mdoc -T ps $f | ps2pdf - - > $outname" >> Makefile
-        all="$all $outname"
-    done
+for f in $MANPAGES; do
+    outname="`basename $f`.pdf"
+    echo >> Makefile
+    echo $outname: $f >> Makefile
+    echo "	groff -mdoc -T ps $f | ps2pdf - - > $outname" >> Makefile
+    all="$all $outname"
 done
 echo $all >>Makefile
 cd ..
@@ -69,14 +68,12 @@ echo > Makefile
 echo "default: all" >>Makefile
 echo >>Makefile
 all="all:"
-for d in libarchive tar cpio; do
-    for f in ../../$d/*.[135]; do
-	outname="`basename $f`.html"
-	echo >> Makefile
-	echo $outname: ../mdoc2man.awk $f >> Makefile
-	echo "	groff -mdoc -T html $f > $outname" >> Makefile
-        all="$all $outname"
-    done
+for f in $MANPAGES; do
+    outname="`basename $f`.html"
+    echo >> Makefile
+    echo $outname: ../mdoc2man.awk $f >> Makefile
+    echo "	groff -mdoc -T html $f > $outname" >> Makefile
+    all="$all $outname"
 done
 echo $all >>Makefile
 cd ..
@@ -88,14 +85,12 @@ echo > Makefile
 echo "default: all" >>Makefile
 echo >>Makefile
 all="all:"
-for d in libarchive tar cpio; do
-    for f in ../../$d/*.[135]; do
-	outname="`basename $f | awk '{ac=split($0,a,"[_.-]");o="ManPage";for(w=0;w<=ac;++w){o=o toupper(substr(a[w],1,1)) substr(a[w],2)};print o}'`.wiki"
-	echo >> Makefile
-	echo $outname: ../mdoc2wiki.awk $f >> Makefile
-	echo "	awk -f ../mdoc2wiki.awk < $f > $outname" >> Makefile
-        all="$all $outname"
-    done
+for f in $MANPAGES; do
+    outname="`basename $f | awk '{ac=split($0,a,"[_.-]");o="ManPage";for(w=0;w<=ac;++w){o=o toupper(substr(a[w],1,1)) substr(a[w],2)};print o}'`.wiki"
+    echo >> Makefile
+    echo $outname: ../mdoc2wiki.awk $f >> Makefile
+    echo "	awk -f ../mdoc2wiki.awk < $f > $outname" >> Makefile
+    all="$all $outname"
 done
 echo $all >>Makefile
 cd ..