Bug 76

diff --git a/configure b/configure
index a2d955754541da03a2659497477cfe799364f0fa..813e701e0e7e8e7726496be3052fb8f233171884 100755 (executable)
--- a/configure
+++ b/configure
@@ -3422,7 +3422,7 @@ if [ "$SYSVINIT" = yes ]; then
            *-linux*)   DIR_SYSVINITSTOP="../rc0.d ../rc1.d ../rc6.d";;
            *-solaris*) DIR_SYSVINITSTOP="../rc0.d ../rc1.d ../rcS.d";;
            *sysv4.2uw2*)       DIR_SYSVINITSTOP="../rc0.d ../rc1.d";;
-           *-UnixWare-*)       DIR_SYSVINITSTOP="../rc0.d ../rc1.d";;
+           *-UnixWare*)        DIR_SYSVINITSTOP="../rc0.d ../rc1.d";;
            *)          DIR_SYSVINITSTOP="../rc0.d";;
        esac
     fi
@@ -3430,30 +3430,27 @@ if [ "$SYSVINIT" = yes ]; then
        case $TARGET in
            *-hpux*)            NAME_SYSVINITSTART="S905hylafax" ;;
            *-linux*)           NAME_SYSVINITSTART="S97hylafax" ;;
-           *-sco3.2v4*)        NAME_SYSVINITSTART="S80hylafax" ;;
            *-sco3.2v5*)        NAME_SYSVINITSTART="S90hylafax" ;;
-           *-solaris*)         NAME_SYSVINITSTART="S80hylafax" ;;
-           *-univel*)          NAME_SYSVINITSTART="S80hylafax" ;;
-           *sysv4.2uw2*)       NAME_SYSVINITSTART="S80hylafax" ;;
-           *-UnixWare-*)       NAME_SYSVINITSTART="S80hylafax" ;;
-           *)                  NAME_SYSVINITSTART="S80fax" ;;
+           *)                  NAME_SYSVINITSTART="S80hylafax" ;;
        esac
     fi
     if [ -z "$NAME_SYSVINITSTOP" ]; then
        case $TARGET in
            *-hpux*)            NAME_SYSVINITSTOP="K095hylafax" ;;
-           *-linux*)           NAME_SYSVINITSTOP="K05hylafax" ;;
-           *-sco3.2v4*)        NAME_SYSVINITSTOP="K05hylafax" ;;
-           *-sco3.2v5*)        NAME_SYSVINITSTOP="K05hylafax" ;;
            *-solaris*)         NAME_SYSVINITSTOP="K20hylafax" ;;
-           *-univel*)          NAME_SYSVINITSTOP="K05hylafax" ;;
-           *sysv4.2uw2*)       NAME_SYSVINITSTOP="K05hylafax" ;;
-           *-UnixWare-*)       NAME_SYSVINITSTOP="K05hylafax" ;;
-           *)                  NAME_SYSVINITSTOP="K80fax" ;;
+           *)                  NAME_SYSVINITSTOP="K05hylafax" ;;
        esac
     fi
 fi
 
+# now to keep from breaking etc/Makefile
+if [ -z "$DIR_SYSVINITSTART" ]; then
+    DIR_SYSVINITSTART="dir_sysvinitstart_set_to_non_null_string"
+fi
+if [ -z "$DIR_SYSVINITSTOP" ]; then
+    DIR_SYSVINITSTOP="dir_sysvinitstop_set_to_non_null_string"
+fi
+
 Note "Done selecting programs."
 
 #

diff --git a/etc/Makefile.in b/etc/Makefile.in
index ad31fdd992e8e212d49aea0fa271125c9de312ac..83e483022f50f11e4beb427758fd45571036cc42 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -106,20 +106,17 @@ installSysVInit: hylafax
        if [ "@SYSVINIT@" = yes ]; then \
            ${PUTSERVER} -F ${DIR_SYSVINIT} -m 755 -O hylafax; \
            echo "checking ${DIR_SYSVINITSTART} directories"; \
-           if test -n "${DIR_SYSVINITSTART}"; then \
-               for i in "${DIR_SYSVINITSTART}"; do \
-                   if test -d ${DIR_SYSVINIT}/$$i; then \
-                       ${PUTSERVER} -F ${DIR_SYSVINIT}/$$i -lns ../`basename ${DIR_SYSVINIT}`/hylafax ${NAME_SYSVINITSTART}; \
-                   fi; \
-               done; \
-           fi; \
-           if test -n "${DIR_SYSVINITSTOP}"; then \
-               for i in "${DIR_SYSVINITSTOP}"; do \
-                   if test -d ${DIR_SYSVINIT}/$$i; then \
-                       ${PUTSERVER} -F ${DIR_SYSVINIT}/$$i -lns ../`basename ${DIR_SYSVINIT}`/hylafax ${NAME_SYSVINITSTOP}; \
-                   fi; \
-               done; \
-           fi \
+           for i in ${DIR_SYSVINITSTART}; do \
+               if test -d ${DIR_SYSVINIT}/$$i; then \
+                   ${PUTSERVER} -F ${DIR_SYSVINIT}/$$i -lns ../`basename ${DIR_SYSVINIT}`/hylafax ${NAME_SYSVINITSTART}; \
+               fi; \
+           done; \
+           echo "checking ${DIR_SYSVINITSTOP} directories"; \
+           for i in ${DIR_SYSVINITSTOP}; do \
+               if test -d ${DIR_SYSVINIT}/$$i; then \
+                   ${PUTSERVER} -F ${DIR_SYSVINIT}/$$i -lns ../`basename ${DIR_SYSVINIT}`/hylafax ${NAME_SYSVINITSTOP}; \
+               fi; \
+           done; \
        else \
            ${PUTSERVER} -F ${SBIN} -m 755 hylafax; \
        fi

diff --git a/html/building.html b/html/building.html
index 3e06fdd6884f3e3d854d0ad17240367af1bca804..d669ea1645401ec2246b7f4873602317571261a7 100644 (file)
--- a/html/building.html
+++ b/html/building.html
@@ -1843,10 +1843,9 @@ is specified then filenames are not converted when they are installed.
 <TD VALIGN=top><TT>NAME_SYSVINITSTART</TT></TD>
 <TD>
 The name of SysV-style start script.
-<br>The default is <B>S80fax</B>.
+<br>The default is <B>S80hylafax</B>.
 <br>On Linux, the default is <B>S97hylafax</B>.
 <br>On HPUX, the default is <B>S905hylafax</B>.
-<br>Solaris, SCO 3.2v4.x, and UnixWare default to <B>S80hylafax</B>.
 <br>SCO 3.2v5.x.x defaults to <B>S90hylafax</B>.
 </TR>
 
@@ -1854,10 +1853,8 @@ The name of SysV-style start script.
 <TD VALIGN=top><TT>NAME_SYSVINITSTOP</TT></TD>
 <TD>
 The name of SysV-style stop script.
-<br>The default is <B>K80fax</B>.
-<br>On Linux, the default is <B>K05hylafax</B>.
+<br>The default is <B>K05hylafax</B>.
 <br>On HPUX, the default is <B>K095hylafax</B>.
-<br>SCO 3.2v4.x, SCO 3.2v5.x.x, and UnixWare default to <B>K05hylafax</B>.
 <br>On Solaris, the default is <B>K20hylafax</B>.
 </TR>