add another way to specify an alternate name for the documentation set,

so that this is harder to forget to do for development of new styles

diff --git a/Doc/.cvsignore b/Doc/.cvsignore
index b5159d8f3f85a83967c40432017ced6b674628c1..8f8d035aa5945de16d61883b11f5aabe31740e83 100755 (executable)
--- a/Doc/.cvsignore
+++ b/Doc/.cvsignore
@@ -3,3 +3,4 @@
 *.zip
 *.tar
 pkglist.html
+.doctype

diff --git a/Doc/tools/push-docs.sh b/Doc/tools/push-docs.sh
index 6dd74e284049cfc6020b4a5d349749eb394f8f76..28a4b31589d1cf61bfab69224b28601b8af21814 100755 (executable)
--- a/Doc/tools/push-docs.sh
+++ b/Doc/tools/push-docs.sh
@@ -26,6 +26,7 @@ else
     DOCTYPE="devel"
 fi
 
+DOCTYPE_SPECIFIED=false
 EXPLANATION=''
 ANNOUNCE=true
 
@@ -55,6 +56,7 @@ while [ "$#" -gt 0 ] ; do
           ;;
       -t)
           DOCTYPE="$2"
+          DOCTYPE_SPECIFIED=true
           shift 2
           ;;
       -F)
@@ -99,9 +101,17 @@ else
     exit 2
 fi
 
+# switch to .../Doc/
 cd ..
 
-# now in .../Doc/
+# If $DOCTYPE was not specified explicitly, look for .doctype in
+# .../Doc/ and use the content of that file if present.
+if $DOCTYPE_SPECIFIED ; then
+    :
+elif [ -f .doctype ] ; then
+    DOCTYPE="`cat .doctype`"
+fi
+
 make --no-print-directory ${PKGTYPE}html || exit $?
 PACKAGE="html-$VERSION.$PKGEXT"
 scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $?