configure patches - Phil Watkinson

fixes up faxsetup so it works now the afm files are gone

fixes the sysv init patch so it installs without breaking.

diff --git a/Makefile.in b/Makefile.in
index 0ee778bce591f3c75cec49769d3fc1c5a860403d..6e366ba81a455f9b4119fb7291f95f6377081300 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -289,7 +289,7 @@ install: makeDirs makeDevices
        else \
            true; \
        fi
-       @${ECHO} "= "etc; cd etc; ${MAKE} installSysVInit; \
+       @${ECHO} "= "etc; cd etc; ${MAKE} installSysVInit;
        @if [ "@HTML@" = yes ]; then \
            ${ECHO} "= "html; cd html; ${MAKE} install; \
        else \

diff --git a/etc/Makefile.in b/etc/Makefile.in
index c0639337491babf4e355a01b5b284cc7dce9c1ad..95be2c783e3f3f88b818f0a4601f53840f25d6ac 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -92,11 +92,11 @@ install: default
 # System V-specific init support.
 #
 installSysVInit: hylafax
-       if [ "@SYSVINIT@" ]; do
-           cp hylafax @SYSVINIT@
-           chmod 755 @SYSVINIT@
-       else
-           ${PUTSERVER} -F ${SBIN} -m 755 hylafax
+       if [ "@SYSVINIT@" ]; do \
+           cp hylafax @SYSVINIT@ \
+           chmod 755 @SYSVINIT@ \
+       else \
+           ${PUTSERVER} -F ${SBIN} -m 755 hylafax \
        fi
        if test -d /etc/config; then \
            ${PUTSERVER} -F /etc/config -m 644 -src config.fax -O fax; \

diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in
index 8135fb32e3fac2f67600097332133d7758de1b33..fa125942806b5a2a83d4cb64a7698b08cf3e36b2 100644 (file)
--- a/etc/faxsetup.sh.in
+++ b/etc/faxsetup.sh.in
@@ -1139,6 +1139,8 @@ system you can obtain them by public FTP from the place where you obtained
 the HylaFAX software or from the master FTP site at ftp.sgi.com.
 EOF
      fi
+     # return to spool directory
+     cd $DIR_SPOOL
 fi
 
 #