May 27, 2001

 (tim) [pkg/Makefile.in make.links make_proto.sh.in cproto.stub.in
	sproto.stub.in] "make package" fixes
 (tim) [faxsetup.sh.in] only write status/any.info on server setup
 (tim) [util/Makefile.in] fixes for building outside of source tree needed
       due to some utilities now created at configure time from .in files

diff --git a/CHANGES b/CHANGES
index 8835d2888b3b503a93e6d20438987316233ec7bd..868219b84064cc46bfd326028fce8b2186ca6c28 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+May 27, 2001
+ (tim) [pkg/Makefile.in make.links make_proto.sh.in cproto.stub.in
+       sproto.stub.in] "make package" fixes
+ (tim) [faxsetup.sh.in] only write status/any.info on server setup
+ (tim) [util/Makefile.in] fixes for building outside of source tree needed
+       due to some utilities now created at configure time from .in files
+
+May 26, 2001
+ (tim) [configure] add support for SCO Open Server 5 using gcc
+ (tim) [Class1Send.c++] fix for SCO Open Server 5 
+       Some compilers do not allow a (goto) label in block with destructors
+
 Changelog for HylaFAX 4.1rc1 - Apr 22, 2001
 
 * Adjusted faxq to load-balance modems with equal priority (22 Apr 2001)

diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in
index d9d20a958088792ec99224bd6d715f2c031dae74..ea81035df35c4d722fbaadf26d405b692221f4e4 100644 (file)
--- a/etc/faxsetup.sh.in
+++ b/etc/faxsetup.sh.in
@@ -1842,17 +1842,19 @@ fi
 #
 # Generate or update default values for status/any.info
 #
-if [ -r $DIR_SPOOL/status/any.info ]; then
-    INFO=`cat $DIR_SPOOL/status/any.info | \
+if onServer; then
+    if [ -r $DIR_SPOOL/status/any.info ]; then
+       INFO=`cat $DIR_SPOOL/status/any.info | \
        $GREP -v "HylaFAX version" | $GREP -v "FaxMaster"`
-else INFO=""
-fi
-if [ -d $DIR_SPOOL/status ]; then
-    echo "Update $DIR_SPOOL/status/any.info."
-    echo "HylaFAX version $VERSION built $DATE for $TARGET" \
+    else INFO=""
+    fi
+    if [ -d $DIR_SPOOL/status ]; then
+       echo "Update $DIR_SPOOL/status/any.info."
+       echo "HylaFAX version $VERSION built $DATE for $TARGET" \
        > $DIR_SPOOL/status/any.info
-    echo $FAXMASTER >> $DIR_SPOOL/status/any.info
-    echo $INFO >> $DIR_SPOOL/status/any.info
+       echo $FAXMASTER >> $DIR_SPOOL/status/any.info
+       echo $INFO >> $DIR_SPOOL/status/any.info
+    fi
 fi
 
 #

diff --git a/pkg/Makefile.in b/pkg/Makefile.in
index 0373c6164460e2db1b8e784019a1ca837357e76d..f6bc9d31f65dc72e61c65b6753c5cbef0ca7aa05 100644 (file)
--- a/pkg/Makefile.in
+++ b/pkg/Makefile.in
@@ -29,37 +29,40 @@ all default:
        done 
 
 BINARIES=\
-       ../faxalter/faxalter \
-       ../faxcover/faxcover \
-       ../faxmail/faxmail \
-       ../faxrm/faxrm \
-       ../faxstat/faxstat \
-       ../sendfax/sendfax \
-       ../sendpage/sendpage \
-       ../util/textfmt \
-       ../faxd/faxgetty \
-       ../faxd/faxsend \
-       ../faxd/pagesend \
-       ../hfaxd/hfaxd \
-       ../etc/lockname \
-       ../etc/ondelay \
-       ../util/faxmsg \
-       ../util/faxconfig \
-       ../util/faxmodem \
-       ../util/faxstate \
-       ../util/faxwatch \
-       ../util/faxinfo \
-       ../util/tiffcheck \
-       ../util/dialtest \
-       ../util/typetest \
-       ../faxd/faxq \
-       ../faxd/faxqclean \
-       ../faxd/tsitest \
-       ../faxd/tagtest \
-       ../faxd/cqtest \
-       ../faxd/choptest \
-       ../html/tools/man2html \
-       ../html/tools/unquote \
+       ../etc/lockname                 \
+       ../etc/ondelay                  \
+       ../faxalter/faxalter            \
+       ../faxcover/faxcover            \
+       ../faxd/choptest                \
+       ../faxd/cqtest                  \
+       ../faxd/faxgetty                \
+       ../faxd/faxq                    \
+       ../faxd/faxqclean               \
+       ../faxd/faxsend                 \
+       ../faxd/mkhash                  \
+       ../faxd/pagesend                \
+       ../faxd/tagtest                 \
+       ../faxd/tsitest                 \
+       ../faxmail/faxmail              \
+       ../faxrm/faxrm                  \
+       ../faxstat/faxstat              \
+       ../hfaxd/hfaxd                  \
+       ../sendfax/sendfax              \
+       ../sendpage/sendpage            \
+       ../util/dialtest                \
+       ../util/faxadduser              \
+       ../util/faxconfig               \
+       ../util/faxdeluser              \
+       ../util/faxinfo                 \
+       ../util/faxmodem                \
+       ../util/faxmsg                  \
+       ../util/faxstate                \
+       ../util/faxwatch                \
+       ../util/textfmt                 \
+       ../util/tiffcheck               \
+       ../util/typetest                \
+       ../html/tools/man2html          \
+       ../html/tools/unquote           \
        ${NULL}
 
 package: cproto sproto all

diff --git a/pkg/cproto.stub.in b/pkg/cproto.stub.in
index 50aebb08284095d4d7c0f6fa6d93d89de5ebc8d7..46cd90046efcfbc566baa5d1e0c3863f6be63a98 100644 (file)
--- a/pkg/cproto.stub.in
+++ b/pkg/cproto.stub.in
@@ -31,8 +31,8 @@ f man @MANDIR@/man1/sendpage.1=../man/cman.apps/sendpage.1 0444 @SYSUID@ @SYSGID
 f man @MANDIR@/man1/sgi2fax.1=../man/cman.apps/sgi2fax.1 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man1/textfmt.1=../man/cman.apps/textfmt.1 0444 @SYSUID@ @SYSGID@
 d man @MANDIR@/man4 ? ? ?
-f man @MANDIR@/man4/pagesizes.4=../man/cman.files/pagesizes.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/typerules.4=../man/cman.files/typerules.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/pagesizes.@MANNUM4_5@=../man/cman.files/pagesizes.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/typerules.@MANNUM4_5@=../man/cman.files/typerules.4f 0444 @SYSUID@ @SYSGID@
 d fonts @AFMDIR@ ? ? ?
 f fonts @AFMDIR@/AvantGarde-Book=../@SRCDIR@/afm/AvantGarde-Book.afm 0444 @SYSUID@ @SYSGID@
 f fonts @AFMDIR@/AvantGarde-BookOblique=../@SRCDIR@/afm/AvantGarde-BookOblique.afm 0444 @SYSUID@ @SYSGID@

diff --git a/pkg/make.links b/pkg/make.links
index 09c07277074469a52514cc197f877965e3b4c378..6bbea05213f1cecea3ce47a8453698b3d691f4c5 100644 (file)
--- a/pkg/make.links
+++ b/pkg/make.links
@@ -2,11 +2,11 @@
 # $Id$
 #      Tim Rice        Tue Oct 28 20:36:07 PST 1997
 #
-#      I like to keep all the HylaFAX files in /usr/local/HylaFAX-v4.0
+#      I like to keep all the HylaFAX files in /usr/local/HylaFAX-v4.1
 #      so I created this script to
 #      Setup symbolic links to the user programs and man pages
 # 
-WHERE_ALL_THE_HYLAFAX_STUFF_IS=/usr/local/HylaFAX-v4.0
+WHERE_ALL_THE_HYLAFAX_STUFF_IS=/usr/local/HylaFAX-v4.1
 #
 #
 #

diff --git a/pkg/make_proto.sh.in b/pkg/make_proto.sh.in
index f9aa1ea040e5373dbce28c5fea59071a20923c14..a454dd56189fb2eedd733cf7f4f2e0402f85ab93 100644 (file)
--- a/pkg/make_proto.sh.in
+++ b/pkg/make_proto.sh.in
@@ -5,7 +5,7 @@
 #
 #      Make prototype
 #
-#      System utilities used: cat, dirname, grep, rm, sort
+#      System utilities used: cat, dirname, grep, mkdir, rm, sed, sort, tr
 #
 LANG=C export LANG
 DIR_BIN=@BIN@
@@ -17,6 +17,14 @@ DIR_SPOOL=@SPOOL@
 DIR_FONTS=@AFMDIR@
 DIR_CGI=@CGIDIR@
 DIR_HTML=@HTMLDIR@
+DIR_SYSVINIT=@SYSVINITDIR@
+DIR_SYSVINITSTART="@SYSVINITDIR@/@SYSVINITSTARTDIR@"
+DIR_SYSVINITSTOP="@SYSVINITDIR@/@SYSVINITSTOPDIR@"
+MANNUM1_8=@MANNUM1_8@
+MANNUM4_5=@MANNUM4_5@
+LMANNUM1_8=`echo ${MANNUM1_8} | tr '[A-Z]' '[a-z]'`
+LMANNUM4_5=`echo ${MANNUM4_5} | tr '[A-Z]' '[a-z]'`
+TMP_DIR=/tmp/.$$hylafax
 TMP_LIST=$$tmp
 LIST="${DIR_BIN} ${DIR_LIB} ${DIR_SLIB} ${DIR_MAN} ${DIR_SBIN}"
 
@@ -27,6 +35,13 @@ case $1 in
        server) PROTOTYPE=sproto
                LIST="${LIST} ${DIR_SPOOL}"
                DO_HTML="@HTML@"
+               [ -d ${TMP_DIR} ]  &&  {
+                       rm -fr ${TMP_DIR}  ||  {
+                               echo "rm -fr ${TMP_DIR} failed"
+                               exit 1
+                       }
+               }
+               (umask 077 ; mkdir ${TMP_DIR})
                        ;;
        *)      echo "usage: $0 server or client"
                exit 1 ;;
@@ -74,6 +89,56 @@ then
        done
 fi
 
+if [ ${PROTOTYPE} = sproto ]
+then
+       for i in ${DIR_SYSVINITSTART}
+       do
+               case ${i} in
+                       /*)     ;;
+                       *)      i=${DIR_SYSVINIT}/${i} ;;
+               esac
+               mkdir -p ${TMP_DIR}/${i}
+               i=`(cd ${TMP_DIR}/${i} ; pwd) | sed "s~${TMP_DIR}~~"`
+               rm -fr ${TMP_DIR}/*
+               echo "s none ${i}/@SYSVINITSTARTNAME@=@SYSVINITDIR@/hylafax" >> ${TMP_LIST}
+               while [ ${i} != / ]
+               do
+                       echo "d none ${i} ? ? ?" >> ${TMP_LIST}
+                       i=`dirname ${i}`
+               done
+       done
+       for i in ${DIR_SYSVINITSTOP}
+       do
+               case ${i} in
+                       /*)     ;;
+                       *)      i=${DIR_SYSVINIT}/${i} ;;
+               esac
+               mkdir -p ${TMP_DIR}/${i}
+               i=`(cd ${TMP_DIR}/${i} ; pwd) | sed "s~${TMP_DIR}~~"`
+               rm -fr ${TMP_DIR}/*
+               echo "s none ${i}/@SYSVINITSTOPNAME@=@SYSVINITDIR@/hylafax" >> ${TMP_LIST}
+               while [ ${i} != / ]
+               do
+                       echo "d none ${i} ? ? ?" >> ${TMP_LIST}
+                       i=`dirname ${i}`
+               done
+       done
+       rm -fr ${TMP_DIR}
+
+       echo "f none ${DIR_SYSVINIT}/hylafax=../etc/hylafax 0755 @SYSUID@ @SYSGID@" >> ${TMP_LIST}
+       while [ ${DIR_SYSVINIT} != / ]
+       do
+               echo "d none ${DIR_SYSVINIT} ? ? ?" >> ${TMP_LIST}
+               DIR_SYSVINIT=`dirname ${DIR_SYSVINIT}`
+       done
+
+       [ -d /etc/config ]  &&  {
+               echo "d none /etc ? ? ?" >> ${TMP_LIST}
+               echo "d none /etc/config ? ? ?" >> ${TMP_LIST}
+               echo "f none /etc/config/fax=../etc/config.fax 0644 @SYSUID@ @SYSGID@" >> ${TMP_LIST}
+       }
+fi
+
 # prototype file
 cat >${PROTOTYPE} <<EOF
 i copyright
@@ -92,7 +157,8 @@ sort -u ${TMP_LIST} >> ${PROTOTYPE}
 rm ${TMP_LIST}
 
 grep " none " ${PROTOTYPE}.stub >> ${PROTOTYPE}
-grep " man " ${PROTOTYPE}.stub >> ${PROTOTYPE}
+grep " man " ${PROTOTYPE}.stub | sed -e "s~\.${MANNUM1_8}=~.${LMANNUM1_8}=~" \
+       -e "s~\.${MANNUM4_5}=~.${LMANNUM4_5}=~" >> ${PROTOTYPE}
 
 if [ "@AFM@" = yes ]
 then

diff --git a/pkg/sproto.stub.in b/pkg/sproto.stub.in
index 8f8982b020150b6a95d459480a7c6ec814054af3..b6ba911c594924e2295539b16dfc0879d1820914 100644 (file)
--- a/pkg/sproto.stub.in
+++ b/pkg/sproto.stub.in
@@ -1,12 +1,3 @@
-d none /etc ? ? ?
-d none @SYSVINITDIR@ ? ? ?
-f none @SYSVINITDIR@/hylafax=../etc/hylafax 0755 @SYSUID@ @SYSGID@
-d none @SYSVINITDIR@/@SYSVINITSTOPDIR@ ? ? ?
-s none @SYSVINITDIR@/@SYSVINITSTOPDIR@/@SYSVINITSTOPNAME@=@SYSVINITDIR@/hylafax
-d none @SYSVINITDIR@/@SYSVINITSTARTDIR@ ? ? ?
-s none @SYSVINITDIR@/@SYSVINITSTARTDIR@/@SYSVINITSTARTNAME@=@SYSVINITDIR@/hylafax
-d none /etc/config ? ? ?
-f none /etc/config/fax=../etc/config.fax 0644 @SYSUID@ @SYSGID@
 d none @BIN@ ? ? ?
 f none @BIN@/faxalter=../faxalter/faxalter 0755 @SYSUID@ @SYSGID@
 f none @BIN@/faxcover=../faxcover/faxcover 0755 @SYSUID@ @SYSGID@
@@ -41,57 +32,63 @@ f man @MANDIR@/man1/sendfax.1=../man/cman.apps/sendfax.1 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man1/sendpage.1=../man/cman.apps/sendpage.1 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man1/sgi2fax.1=../man/cman.apps/sgi2fax.1 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man1/textfmt.1=../man/cman.apps/textfmt.1 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/choptest.1=../man/sman.apps/choptest.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/cqtest.1=../man/sman.apps/cqtest.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/dialtest.1=../man/sman.apps/dialtest.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxabort.1=../man/sman.apps/faxabort.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxaddmodem.1=../man/sman.apps/faxaddmodem.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxanswer.1=../man/sman.apps/faxanswer.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxconfig.1=../man/sman.apps/faxconfig.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxcron.1=../man/sman.apps/faxcron.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxgetty.1=../man/sman.apps/faxgetty.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxinfo.1=../man/sman.apps/faxinfo.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxmodem.1=../man/sman.apps/faxmodem.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxq.1=../man/sman.apps/faxq.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxqclean.1=../man/sman.apps/faxqclean.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxquit.1=../man/sman.apps/faxquit.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxrcvd.1=../man/sman.apps/faxrcvd.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxsend.1=../man/sman.apps/faxsend.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxsetup.1=../man/sman.apps/faxsetup.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxstate.1=../man/sman.apps/faxstate.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/faxwatch.1=../man/sman.apps/faxwatch.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/hfaxd.1=../man/sman.apps/hfaxd.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/mkcover.1=../man/sman.apps/mkcover.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/notify.1=../man/sman.apps/notify.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/pagesend.1=../man/sman.apps/pagesend.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/pollrcvd.1=../man/sman.apps/pollrcvd.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/ps2fax.1=../man/sman.apps/ps2fax.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/recvstats.1=../man/sman.apps/recvstats.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/tagtest.1=../man/sman.apps/tagtest.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/tiff2fax.1=../man/sman.apps/tiff2fax.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/tiffcheck.1=../man/sman.apps/tiffcheck.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/tsitest.1=../man/sman.apps/tsitest.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/wedged.1=../man/sman.apps/wedged.1m 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man1/xferfaxstats.1=../man/sman.apps/xferfaxstats.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/choptest.@MANNUM1_8@=../man/sman.apps/choptest.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/cqtest.@MANNUM1_8@=../man/sman.apps/cqtest.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/dialtest.@MANNUM1_8@=../man/sman.apps/dialtest.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxabort.@MANNUM1_8@=../man/sman.apps/faxabort.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxaddmodem.@MANNUM1_8@=../man/sman.apps/faxaddmodem.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxadduser.@MANNUM1_8@=../man/sman.apps/faxadduser.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxanswer.@MANNUM1_8@=../man/sman.apps/faxanswer.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxconfig.@MANNUM1_8@=../man/sman.apps/faxconfig.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxcron.@MANNUM1_8@=../man/sman.apps/faxcron.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxdeluser.@MANNUM1_8@=../man/sman.apps/faxdeluser.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxgetty.@MANNUM1_8@=../man/sman.apps/faxgetty.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxinfo.@MANNUM1_8@=../man/sman.apps/faxinfo.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxmodem.@MANNUM1_8@=../man/sman.apps/faxmodem.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxq.@MANNUM1_8@=../man/sman.apps/faxq.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxqclean.@MANNUM1_8@=../man/sman.apps/faxqclean.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxquit.@MANNUM1_8@=../man/sman.apps/faxquit.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxrcvd.@MANNUM1_8@=../man/sman.apps/faxrcvd.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxsend.@MANNUM1_8@=../man/sman.apps/faxsend.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxsetup.@MANNUM1_8@=../man/sman.apps/faxsetup.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxstate.@MANNUM1_8@=../man/sman.apps/faxstate.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/faxwatch.@MANNUM1_8@=../man/sman.apps/faxwatch.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/hfaxd.@MANNUM1_8@=../man/sman.apps/hfaxd.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/mkcover.@MANNUM1_8@=../man/sman.apps/mkcover.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/notify.@MANNUM1_8@=../man/sman.apps/notify.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/pdf2fax.@MANNUM1_8@=../man/sman.apps/pdf2fax.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/pagesend.@MANNUM1_8@=../man/sman.apps/pagesend.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/pollrcvd.@MANNUM1_8@=../man/sman.apps/pollrcvd.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/ps2fax.@MANNUM1_8@=../man/sman.apps/ps2fax.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/recvstats.@MANNUM1_8@=../man/sman.apps/recvstats.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/tagtest.@MANNUM1_8@=../man/sman.apps/tagtest.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/tiff2fax.@MANNUM1_8@=../man/sman.apps/tiff2fax.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/tiffcheck.@MANNUM1_8@=../man/sman.apps/tiffcheck.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/tsitest.@MANNUM1_8@=../man/sman.apps/tsitest.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/wedged.@MANNUM1_8@=../man/sman.apps/wedged.1m 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man1/xferfaxstats.@MANNUM1_8@=../man/sman.apps/xferfaxstats.1m 0444 @SYSUID@ @SYSGID@
 d man @MANDIR@/man4 ? ? ?
-f man @MANDIR@/man4/pagesizes.4=../man/cman.files/pagesizes.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/typerules.4=../man/cman.files/typerules.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/cid.4=../man/sman.files/cid.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/config.4=../man/sman.files/config.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/destctrls.4=../man/sman.files/destctrls.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/dialrules.4=../man/sman.files/dialrules.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/hosts.hfaxd.4=../man/sman.files/hosts.hfaxd.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/hylafax-server.4=../man/sman.files/hylafax-server.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/info.4=../man/sman.files/info.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/log.4=../man/sman.files/log.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/pagermap.4=../man/sman.files/pagermap.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/recvq.4=../man/sman.files/recvq.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/sendq.4=../man/sman.files/sendq.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/shutdown.4=../man/sman.files/shutdown.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/status.4=../man/sman.files/status.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/tsi.4=../man/sman.files/tsi.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/xferfaxlog.4=../man/sman.files/xferfaxlog.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/pagesizes.@MANNUM4_5@=../man/cman.files/pagesizes.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/typerules.@MANNUM4_5@=../man/cman.files/typerules.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/cid.@MANNUM4_5@=../man/sman.files/cid.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/config.@MANNUM4_5@=../man/sman.files/config.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/destctrls.@MANNUM4_5@=../man/sman.files/destctrls.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/dialrules.@MANNUM4_5@=../man/sman.files/dialrules.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/doneq.@MANNUM4_5@=../man/sman.files/doneq.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/hosts.hfaxd.@MANNUM4_5@=../man/sman.files/hosts.hfaxd.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/hylafax-server.@MANNUM4_5@=../man/sman.files/hylafax-server.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/info.@MANNUM4_5@=../man/sman.files/info.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/log.@MANNUM4_5@=../man/sman.files/log.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/pagermap.@MANNUM4_5@=../man/sman.files/pagermap.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/recvq.@MANNUM4_5@=../man/sman.files/recvq.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/sendq.@MANNUM4_5@=../man/sman.files/sendq.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/shutdown.@MANNUM4_5@=../man/sman.files/shutdown.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/status.@MANNUM4_5@=../man/sman.files/status.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/tsi.@MANNUM4_5@=../man/sman.files/tsi.4f 0444 @SYSUID@ @SYSGID@
+f man @MANDIR@/man4/xferfaxlog.@MANNUM4_5@=../man/sman.files/xferfaxlog.4f 0444 @SYSUID@ @SYSGID@
 d none @SBIN@ ? ? ?
+f none @SBIN@/faxadduser=../util/faxadduser 0755 @SYSUID@ @SYSGID@
+f none @SBIN@/faxdeluser=../util/faxdeluser 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/faxmsg=../util/faxmsg 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/faxconfig=../util/faxconfig 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/faxmodem=../util/faxmodem 0755 @SYSUID@ @SYSGID@
@@ -113,25 +110,26 @@ f none @SBIN@/tsitest=../faxd/tsitest 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/tagtest=../faxd/tagtest 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/cqtest=../faxd/cqtest 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/choptest=../faxd/choptest 0755 @SYSUID@ @SYSGID@
-f none @SBIN@/faxaddmodem=../etc/faxaddmodem 0755 @SYSUID@ @SYSGID@
-f none @SBIN@/faxsetup=../etc/faxsetup 0755 @SYSUID@ @SYSGID@
+f none @SBIN@/faxaddmodem=../etc/faxaddmodem.sh 0755 @SYSUID@ @SYSGID@
+f none @SBIN@/faxsetup=../etc/faxsetup.sh 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/faxsetup.bsdi=../@SRCDIR@/etc/faxsetup.bsdi 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/faxsetup.irix=../@SRCDIR@/etc/faxsetup.irix 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/faxsetup.linux=../@SRCDIR@/etc/faxsetup.linux 0755 @SYSUID@ @SYSGID@
 f none @SBIN@/probemodem=../etc/probemodem.sh 0755 @SYSUID@ @SYSGID@
 d none @SPOOL@ 0755 @FAXUID@ @FAXGID@
 d none @SPOOL@/bin 0755 @FAXUID@ @FAXGID@
-f none @SPOOL@/bin/ps2fax.gs=../@SRCDIR@/util/ps2fax.gs.sh 0755 @SYSUID@ @SYSGID@
-f none @SPOOL@/bin/ps2fax.dps=../@SRCDIR@/util/ps2fax.dps.sh 0755 @SYSUID@ @SYSGID@
-f none @SPOOL@/bin/ps2fax.imp=../@SRCDIR@/util/ps2fax.imp.sh 0755 @SYSUID@ @SYSGID@
-f none @SPOOL@/bin/pcl2fax=../@SRCDIR@/util/pcl2fax.sh 0755 @SYSUID@ @SYSGID@
-f none @SPOOL@/bin/tiff2fax=../@SRCDIR@/util/tiff2fax.sh 0755 @SYSUID@ @SYSGID@
-f none @SPOOL@/bin/notify=../@SRCDIR@/util/notify.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/pdf2fax.gs=../@SRCDIR@/util/pdf2fax.gs.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/ps2fax.gs=../util/ps2fax.gs.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/ps2fax.dps=../util/ps2fax.dps.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/ps2fax.imp=../util/ps2fax.imp.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/pcl2fax=../util/pcl2fax.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/tiff2fax=../util/tiff2fax.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/notify=../util/notify.sh 0755 @SYSUID@ @SYSGID@
 f none @SPOOL@/bin/notify.awk=../@SRCDIR@/util/notify.awk 0444 @SYSUID@ @SYSGID@
-f none @SPOOL@/bin/faxrcvd=../@SRCDIR@/util/faxrcvd.sh 0755 @SYSUID@ @SYSGID@
-f none @SPOOL@/bin/pollrcvd=../@SRCDIR@/util/pollrcvd.sh 0755 @SYSUID@ @SYSGID@
-f none @SPOOL@/bin/mkcover=../@SRCDIR@/util/mkcover.sh 0755 @SYSUID@ @SYSGID@
-f none @SPOOL@/bin/wedged=../@SRCDIR@/util/wedged.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/faxrcvd=../util/faxrcvd.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/pollrcvd=../util/pollrcvd.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/mkcover=../util/mkcover.sh 0755 @SYSUID@ @SYSGID@
+f none @SPOOL@/bin/wedged=../util/wedged.sh 0755 @SYSUID@ @SYSGID@
 d none @SPOOL@/client 0755 @FAXUID@ @FAXGID@
 d none @SPOOL@/config 0755 @FAXUID@ @FAXGID@
 f none @SPOOL@/config/class1=../@SRCDIR@/config/class1 0444 @SYSUID@ @SYSGID@
@@ -171,6 +169,7 @@ f none @SPOOL@/config/telebit-qblazer=../@SRCDIR@/config/telebit-qblazer 0444 @S
 f none @SPOOL@/config/telebit-wb=../@SRCDIR@/config/telebit-wb 0444 @SYSUID@ @SYSGID@
 f none @SPOOL@/config/tricom2842=../@SRCDIR@/config/tricom2842 0444 @SYSUID@ @SYSGID@
 f none @SPOOL@/config/uds-fastalk=../@SRCDIR@/config/uds-fastalk 0444 @SYSUID@ @SYSGID@
+f none @SPOOL@/config/umc92144=../@SRCDIR@/config/umc92144 0444 @SYSUID@ @SYSGID@
 f none @SPOOL@/config/usr-2.0=../@SRCDIR@/config/usr-2.0 0444 @SYSUID@ @SYSGID@
 f none @SPOOL@/config/usr-rts=../@SRCDIR@/config/usr-rts 0444 @SYSUID@ @SYSGID@
 f none @SPOOL@/config/usr-xon=../@SRCDIR@/config/usr-xon 0444 @SYSUID@ @SYSGID@
@@ -210,6 +209,7 @@ f html @HTMLDIR@/icons/at_work_icon.gif=../@SRCDIR@/html/icons/at_work_icon.gif
 f html @HTMLDIR@/icons/ball_blue_icon.gif=../@SRCDIR@/html/icons/ball_blue_icon.gif 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/icons/button.excl.gif=../@SRCDIR@/html/icons/button.excl.gif 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/icons/back.gif=../@SRCDIR@/html/icons/back.gif 0444 @SYSUID@ @SYSGID@
+f html @HTMLDIR@/icons/contents.gif=../@SRCDIR@/html/icons/contents.gif 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/icons/frog.gif=../@SRCDIR@/html/icons/frog.gif 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/icons/improved.gif=../@SRCDIR@/html/icons/improved.gif 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/icons/info_icon.gif=../@SRCDIR@/html/icons/info_icon.gif 0444 @SYSUID@ @SYSGID@
@@ -249,6 +249,8 @@ f html @HTMLDIR@/Modems/ucom-traveller96.html=../@SRCDIR@/html/Modems/ucom-trave
 f html @HTMLDIR@/Modems/usr-courier.html=../@SRCDIR@/html/Modems/usr-courier.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/usr-sportster.html=../@SRCDIR@/html/Modems/usr-sportster.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/zyxel-1496.html=../@SRCDIR@/html/Modems/zyxel-1496.html 0444 @SYSUID@ @SYSGID@
+f html @HTMLDIR@/Modems/zyxel-elite.html=../@SRCDIR@/html/Modems/zyxel-elite.html 0444 @SYSUID@ @SYSGID@
+f html @HTMLDIR@/Modems/zyxel-omni.html=../@SRCDIR@/html/Modems/zyxel-omni.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/multitech-2834.html=../@SRCDIR@/html/Modems/multitech-2834.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/Modems/hayes-accura288.html=../@SRCDIR@/html/Modems/hayes-accura288.html 0444 @SYSUID@ @SYSGID@
 d html @HTMLDIR@/Majordomo 0755 @SYSUID@ @SYSGID@

diff --git a/util/Makefile.in b/util/Makefile.in
index 2135ea4387e356b9bb7d136353dc92d09ab9e59a..387dd72872e62aa4e8bc7b041f1f97a736b53831 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -171,18 +171,18 @@ install: installClient
        ${PUTSBIN} -m 755 -src xferfaxstats.sh -O xferfaxstats
        ${PUTSBIN} -m 755 -src recvstats.sh -O recvstats
        ${PUTSBIN} -m 755 -idb "config(update)" -src faxcron.sh -O faxcron
-       ${PUTSUPD} -m 755 -src ${SRCDIR}/ps2fax.gs.sh -O ps2fax.gs
-       ${PUTSUPD} -m 755 -src ${SRCDIR}/ps2fax.dps.sh -O ps2fax.dps
-       ${PUTSUPD} -m 755 -src ${SRCDIR}/ps2fax.imp.sh -O ps2fax.imp
-       ${PUTSUPD} -m 755 -src ${SRCDIR}/pdf2fax.gs.sh -O pdf2fax.gs
-       ${PUTSUPD} -m 755 -src ${SRCDIR}/pcl2fax.sh -O pcl2fax
-       ${PUTSUPD} -m 755 -src ${SRCDIR}/tiff2fax.sh -O tiff2fax
-       ${PUTSUPD} -m 755 -src ${SRCDIR}/notify.sh -O notify
+       ${PUTSUPD} -m 755 -src ps2fax.gs.sh -O ps2fax.gs
+       ${PUTSUPD} -m 755 -src ps2fax.dps.sh -O ps2fax.dps
+       ${PUTSUPD} -m 755 -src ps2fax.imp.sh -O ps2fax.imp
+       ${PUTSUPD} -m 755 -src $(SRCDIR)/pdf2fax.gs.sh -O pdf2fax.gs
+       ${PUTSUPD} -m 755 -src pcl2fax.sh -O pcl2fax
+       ${PUTSUPD} -m 755 -src tiff2fax.sh -O tiff2fax
+       ${PUTSUPD} -m 755 -src notify.sh -O notify
        ${PUTSUPD} -m 444 -src ${SRCDIR}/notify.awk -O notify.awk
-       ${PUTSUPD} -m 755 -src ${SRCDIR}/faxrcvd.sh -O faxrcvd
-       ${PUTSUPD} -m 755 -src ${SRCDIR}/pollrcvd.sh -O pollrcvd
-       ${PUTSUPD} -m 755 -src ${SRCDIR}/mkcover.sh -O mkcover
-       ${PUTSUPD} -m 755 -src ${SRCDIR}/wedged.sh -O wedged
+       ${PUTSUPD} -m 755 -src faxrcvd.sh -O faxrcvd
+       ${PUTSUPD} -m 755 -src pollrcvd.sh -O pollrcvd
+       ${PUTSUPD} -m 755 -src mkcover.sh -O mkcover
+       ${PUTSUPD} -m 755 -src wedged.sh -O wedged
        ${PUTSERVER} -F ${SPOOL}/etc -m 444 -idb "config(update)" \
            -src ${SRCDIR}/dpsprinter.ps -O dpsprinter.ps
        ${PUTSERVER} -F ${SPOOL}/etc -idb "config(suggest)" \